From: Brion Vibber <brion@pobox.com>
Date: Tue, 26 Jul 2011 22:57:29 +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=11f45e57d9c5ab5d6d0b53fa0b21b3c71e2ac84a;p=quix0rs-gnu-social.git

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

11f45e57d9c5ab5d6d0b53fa0b21b3c71e2ac84a