From: Evan Prodromou Date: Mon, 4 Apr 2011 22:20:45 +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=229692be3a78da688c2d43dfb4dd9e030da0ea9c;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 229692be3a78da688c2d43dfb4dd9e030da0ea9c