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

Conflicts:
	lib/schema.php

diff --cc config.php.sample
index 9e0b4e2acae57d4dd6d7cbc54191a917116793ce,2aa9326a4ae5119aac8ad3d3e422cf8b9b11d436..a4580dabbe1006b438fa8252707422b12ae68b50
--- 1/config.php.sample
--- 2/config.php.sample
+++ b/config.php.sample
@@@ -195,9 -198,9 +195,9 @@@ $config['sphinx']['port'] = 3312
  //
  // NOTE: if you enable this you must also set $config['avatar']['path']
  //
 -// $config['twitterbridge']['enabled'] = true;
 +// $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';