From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 21:36:54 +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=4a54bb337aae192a66b31d2b12b6eb456c1ad212;p=quix0rs-gnu-social.git

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

4a54bb337aae192a66b31d2b12b6eb456c1ad212