From: Brion Vibber Date: Thu, 27 May 2010 21:22:24 +0000 (-0700) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2b318a3420fe3e979defc7eacfb1eb2d9321d807;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- 2b318a3420fe3e979defc7eacfb1eb2d9321d807