From: Evan Prodromou Date: Mon, 7 Mar 2011 20:21:47 +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=07f62f14121c8c3c9c054635e1d54d405273d95c;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 07f62f14121c8c3c9c054635e1d54d405273d95c