From: Evan Prodromou Date: Mon, 8 Aug 2011 16:01:48 +0000 (-0400) Subject: Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=632ed129ebc70480f7ad010764bd73750b89bb55;p=quix0rs-gnu-social.git Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x --- 632ed129ebc70480f7ad010764bd73750b89bb55