From: Brion Vibber Date: Wed, 16 Mar 2011 22:56:32 +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=2bad1d0cd98a956d0cb512f889453f39da576720;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 2bad1d0cd98a956d0cb512f889453f39da576720