From: Evan Prodromou Date: Sun, 21 Feb 2010 01:27:04 +0000 (-0500) Subject: Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5565216b42fc97d84c9602864b2095e557769717;p=quix0rs-gnu-social.git Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing Conflicts: plugins/OStatus/OStatusPlugin.php --- 5565216b42fc97d84c9602864b2095e557769717