From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 00:16:06 +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=2858f495fac78b601fa51ea5f3e43023030232fe;p=quix0rs-gnu-social.git

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

2858f495fac78b601fa51ea5f3e43023030232fe