From: Brion Vibber Date: Fri, 15 Apr 2011 22:14:21 +0000 (-0700) 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=37a37e1dd59d08a70922118024966ed3b8c9658c;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 37a37e1dd59d08a70922118024966ed3b8c9658c