From: Evan Prodromou Date: Thu, 14 Jul 2011 16:54:45 +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=9145ce4259676143f42292521d9a6318a3b6be09;p=quix0rs-gnu-social.git Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x --- 9145ce4259676143f42292521d9a6318a3b6be09