From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 21:41:01 +0000 (-0800)
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=d8e30fa4951c87c291a05a4d2d579767b2e84787;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
---

d8e30fa4951c87c291a05a4d2d579767b2e84787