Merge commit 'mainline/0.9.x' into 0.9.x

diff --combined config.php.sample
index a4580dabbe1006b438fa8252707422b12ae68b50,75f5c7d557fd7e82d06370b81779111701fffe70..20de7ffedfb72acc5df9808add46e1703d4a0273
--- 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
@@@ -197,7 -197,7 +197,7 @@@
  //
  // $config['twitterimport']['enabled'] = true;
  
 -// Twitter OAuth settings
 +// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ
  // $config['twitter']['consumer_key']    = 'YOURKEY';
  // $config['twitter']['consumer_secret'] = 'YOURSECRET';