From: Evan Prodromou Date: Tue, 5 Apr 2011 17:29:02 +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=46e03373480bf051df10fb8c047a3fc4ca4abdee;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 46e03373480bf051df10fb8c047a3fc4ca4abdee