From: Evan Prodromou Date: Tue, 21 Jun 2011 18:12:24 +0000 (-0400) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f7ba2d1f8a78233efeb99124198b8f597360a734;p=quix0rs-gnu-social.git Merge branch 'testing' of gitorious.org:statusnet/mainline into testing --- f7ba2d1f8a78233efeb99124198b8f597360a734