From: Ian Denhardt Date: Fri, 27 May 2011 15:28:47 +0000 (-0400) Subject: Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e4ec0df0ecc4fc8e41dea46ddfe4bd1796208ff;p=quix0rs-gnu-social.git Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline --- 2e4ec0df0ecc4fc8e41dea46ddfe4bd1796208ff