Merge branch 'master' into 0.8.x

Conflicts:
	lib/mail.php
	lib/rssaction.php
	lib/twitterapi.php

diff --cc lib/mail.php
Simple merge

diff --cc lib/twitterapi.php
index a5dc2067f85ffb389471fdb799254526cfe917af,ab6c0d62c8a5ec409d6e222e5020d48be41afef3..58300720865ced1b66ee77f2795a3f6c449ea862
--- 1/lib/twitterapi.php
--- 2/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@@ -186,22 -186,22 +186,22 @@@ class TwitterapiAction extends Actio
              $twitter_status['favorited'] = false;
          }
  
 -        # Enclosures
 +        // Enclosures
          $attachments = $notice->attachments();
-         $enclosures = array();
- 
-         foreach ($attachments as $attachment) {
-             if ($attachment->isEnclosure()) {
-                  $enclosure = array();
-                  $enclosure['url'] = $attachment->url;
-                  $enclosure['mimetype'] = $attachment->mimetype;
-                  $enclosure['size'] = $attachment->size;
-                  $enclosures[] = $enclosure;
-             }
-         }
  
-         if (!empty($enclosures)) {
-             $twitter_status['attachments'] = $enclosures;
+         if (!empty($attachments)) {
+ 
+             $twitter_status['attachments'] = array();
+ 
+             foreach ($attachments as $attachment) {
+                 if ($attachment->isEnclosure()) {
+                     $enclosure = array();
+                     $enclosure['url'] = $attachment->url;
+                     $enclosure['mimetype'] = $attachment->mimetype;
+                     $enclosure['size'] = $attachment->size;
+                     $twitter_status['attachments'][] = $enclosure;
+                 }
+             }
          }
  
          if ($include_user) {