From: Evan Prodromou Date: Wed, 24 Aug 2011 21:17:32 +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=904101b97312202578e0348fe4f436a10d73f3de;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 904101b97312202578e0348fe4f436a10d73f3de