From: Evan Prodromou Date: Sat, 7 May 2011 00:19:05 +0000 (-0700) Subject: Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=7b0ab409c905a85e7d27a16e98ff430a8540781c Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x --- 7b0ab409c905a85e7d27a16e98ff430a8540781c