From: Evan Prodromou Date: Thu, 7 Apr 2011 14:26:50 +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=703f19a1085a40181c0538377b4e9841470534b5;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 703f19a1085a40181c0538377b4e9841470534b5