Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --combined config.php.sample
index 9e0b4e2acae57d4dd6d7cbc54191a917116793ce,3d2a52beccefe943824a80a289589df4a8a6c652..75f5c7d557fd7e82d06370b81779111701fffe70
--- 1/config.php.sample
--- 2/config.php.sample
+++ b/config.php.sample
@@@ -124,6 -124,8 +124,8 @@@ $config['sphinx']['port'] = 3312
  
  // Email info, used for all outbound email
  // $config['mail']['notifyfrom'] = 'microblog@example.net';
+ // Domain for generating no-reply and incoming email addresses, if enabled.
+ // Defaults to site server name.
  // $config['mail']['domain'] = 'microblog.example.net';
  // See http://pear.php.net/manual/en/package.mail.mail.factory.php for options
  // $config['mail']['backend'] = 'smtp';
@@@ -131,8 -133,6 +133,6 @@@
  //                                                    'host' => 'localhost',
  //                                                    'port' => 25,
  //                                                    );
- // For incoming email, if enabled. Defaults to site server name.
- // $config['mail']['domain'] = 'incoming.example.net';
  
  // exponential decay factor for tags, default 10 days
  // raise this if traffic is slow, lower it if it's fast
@@@ -268,8 -268,6 +268,8 @@@
  // Support for file uploads (attachments),
  // select supported mimetypes and quotas (in bytes)
  // $config['attachments']['supported'] = array('image/png', 'application/ogg');
 +// $config['attachments']['supported'] = true; //allow all file types to be uploaded
 +
  // $config['attachments']['file_quota'] = 5000000;
  // $config['attachments']['user_quota'] = 50000000;
  // $config['attachments']['monthly_quota'] = 15000000;