From: Evan Prodromou Date: Tue, 7 Sep 2010 08:27:18 +0000 (-0400) Subject: Merge branch 'twitterannoyances' of gitorious.org:~evan/statusnet/evans-mainline... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7af1d4e5890d6dfbf1c85093c22b9c281c0e8f55;p=quix0rs-gnu-social.git Merge branch 'twitterannoyances' of gitorious.org:~evan/statusnet/evans-mainline into twitterannoyances Conflicts: plugins/TwitterBridge/TwitterBridgePlugin.php plugins/TwitterBridge/daemons/twitterstatusfetcher.php --- 7af1d4e5890d6dfbf1c85093c22b9c281c0e8f55