From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Feb 2011 21:50:31 +0000 (-0800)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a0c669808e2af08ff0ceceac7e2352c1b45b5988;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:statusnet/mainline
---

a0c669808e2af08ff0ceceac7e2352c1b45b5988