From: Brion Vibber Date: Wed, 16 Mar 2011 23:12:31 +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=306639c0f172b064253ac961b2e420ec11eb7e1c;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 306639c0f172b064253ac961b2e420ec11eb7e1c