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