Mikael Nordfeldth dc495a52ea Merge commit 'refs/merge-requests/39' of https://gitorious.org/social/mainline into merge-requests/39 vor 10 Jahren
..
synctwitterfriends.php 74d4e2fa10 TwitterBridge: don't array_merge() non-arrays vor 10 Jahren
twitterdaemon.php 8cd1bdc686 Remove Jabber stuff from Twitter daemon vor 12 Jahren
twitterstatusfetcher.php 55321af4c8 Make TwitterBridge less noisy vor 10 Jahren