From: Evan Prodromou Date: Fri, 30 Apr 2010 19:00:55 +0000 (-0400) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3f2c805652cd641f82af41cd5f92cb54d0457a59;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- 3f2c805652cd641f82af41cd5f92cb54d0457a59