From: Evan Prodromou Date: Sat, 27 Aug 2011 22:22:03 +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=a2ea31bc802df88dbdf504bdfef43d0d4957407e;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- a2ea31bc802df88dbdf504bdfef43d0d4957407e