From: Evan Prodromou Date: Tue, 23 Feb 2010 21:02:27 +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=b09304a6c4553044983176fb2740206777868378;p=quix0rs-gnu-social.git Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing Conflicts: plugins/OStatus/OStatusPlugin.php --- b09304a6c4553044983176fb2740206777868378