From: Brion Vibber Date: Mon, 7 Mar 2011 20:20:11 +0000 (-0800) 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=f4f4e7499febb2c4be16b273ecdc7c206a87c275;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- f4f4e7499febb2c4be16b273ecdc7c206a87c275