Merge commit 'refs/merge-requests/39' of https://gitorious.org/social/mainline into merge-requests/39

plugins/TwitterBridge/daemons/synctwitterfriends.php

@@ -183,9 +183,11 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
                            "of Twitter user $flink->foreign_id friends.");
                 continue;
             } else {
+                if (is_array($more_friends)) {
                     $friends = array_merge($friends, $more_friends);
                 }
             }
+        }
 
         return $friends;
     }