From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 6 Mar 2010 20:30:07 +0000 (+1300)
Subject: Merge commit 'origin/0.9.x' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c89ed16d24d56879bf40a70d500509d1d42a4532;p=quix0rs-gnu-social.git

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

Conflicts:
	lib/schema.php
---

c89ed16d24d56879bf40a70d500509d1d42a4532
diff --cc config.php.sample
index 9e0b4e2aca,2aa9326a4a..a4580dabbe
--- a/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';