From: Evan Prodromou Date: Mon, 4 Jul 2011 16:26:41 +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=15dafffb3b5951f1360176e569c4a0c6d3bcdb55;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 15dafffb3b5951f1360176e569c4a0c6d3bcdb55