From: Brion Vibber <brion@pobox.com>
Date: Sun, 3 Apr 2011 22:23:27 +0000 (-0700)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=894ef352591fe581909c01c46047bf530e59a984

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

894ef352591fe581909c01c46047bf530e59a984