From: Evan Prodromou Date: Sun, 21 Feb 2010 14:19: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=9898bbdeb29c02ee1864a41bd747ac3ec7505e54;p=quix0rs-gnu-social.git Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing Conflicts: plugins/OStatus/lib/activity.php --- 9898bbdeb29c02ee1864a41bd747ac3ec7505e54