From: Evan Prodromou Date: Wed, 6 Apr 2011 21:57:57 +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=402c0654ea1a91be6e45c4bfbbfed64a31f1f505;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 402c0654ea1a91be6e45c4bfbbfed64a31f1f505