Merge branch 'twitter-oauth' into 0.8.x

Conflicts:

	scripts/getvaliddaemons.php

1 files changed, 1 insertions, 0 deletions

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 8b127bd20..f1d8d8116 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -45,6 +45,7 @@ if(common_config('twitterbridge','enabled')) {
 echo "ombqueuehandler.php ";
 if (common_config('twitter', 'enabled')) {
     echo "twitterqueuehandler.php ";
+    echo "synctwitterfriends.php ";
 }
 echo "facebookqueuehandler.php ";
 echo "pingqueuehandler.php ";