From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 18:58:45 +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=9185364f5aac1130bbb8fe578fc31ce88f823af2;p=quix0rs-gnu-social.git

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

9185364f5aac1130bbb8fe578fc31ce88f823af2