From: Evan Prodromou Date: Tue, 31 May 2011 21:01:11 +0000 (-0400) Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=506958f2c8970205aa221c7024c19bb87b9324d8;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 506958f2c8970205aa221c7024c19bb87b9324d8