From: Evan Prodromou Date: Wed, 9 Mar 2011 03:48:34 +0000 (-0500) 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=88e09d45c91b5f59bd5e012ebbef73c635abcb18;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 88e09d45c91b5f59bd5e012ebbef73c635abcb18