Merge branch 'twitter-oauth' into 0.8.x

Conflicts:

	scripts/getvaliddaemons.php

diff --cc actions/twittersettings.php
Simple merge

diff --cc config.php.sample
Simple merge

diff --cc lib/common.php
Simple merge

diff --cc lib/mail.php
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc scripts/getvaliddaemons.php
index 8b127bd201be9516466c9541ef51b2ba8cb9428b,9a2b8332933ea249eba30900157d9dddbfb3d7a8..f1d8d8116d0deb6f1d60ec46b56d2dba721732b9
--- 1/scripts/getvaliddaemons.php
--- 2/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@@ -43,11 -43,8 +43,12 @@@ if(common_config('twitterbridge','enabl
      echo "twitterstatusfetcher.php ";
  }
  echo "ombqueuehandler.php ";
 -echo "twitterqueuehandler.php ";
 -echo "synctwitterfriends.php ";
 +if (common_config('twitter', 'enabled')) {
 +    echo "twitterqueuehandler.php ";
++    echo "synctwitterfriends.php ";
 +}
  echo "facebookqueuehandler.php ";
  echo "pingqueuehandler.php ";
 -echo "smsqueuehandler.php ";
 +if (common_config('sms', 'enabled')) {
 +    echo "smsqueuehandler.php ";
 +}