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