From: Evan Prodromou Date: Tue, 1 Jun 2010 20:51:41 +0000 (-0700) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a5de2152672f49ad95f114033ef6bf00ece9a0ab;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- a5de2152672f49ad95f114033ef6bf00ece9a0ab