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

Conflicts:
	lib/schema.php

diff --git a/config.php.sample b/config.php.sample
index 9e0b4e2acae57d4dd6d7cbc54191a917116793ce..a4580dabbe1006b438fa8252707422b12ae68b50 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -197,7 +197,7 @@ $config['sphinx']['port'] = 3312;
 //
 // $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';