From: Evan Prodromou Date: Mon, 4 Apr 2011 20:26:26 +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=51dc0e1c9bb52c903711ddc9a24976ba94a079ad;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 51dc0e1c9bb52c903711ddc9a24976ba94a079ad