From: Evan Prodromou Date: Fri, 21 May 2010 20:47:57 +0000 (-0400) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- 6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d