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

diff --git a/config.php.sample b/config.php.sample
index b8852dc672f3b755b3e715b2df1969e825e85168..2aa9326a4ae5119aac8ad3d3e422cf8b9b11d436 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -200,7 +200,7 @@ $config['sphinx']['port'] = 3312;
 //
 // $config['twitterbridge']['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';