From: Evan Prodromou <evan@status.net>
Date: Thu, 24 Mar 2011 22:05:32 +0000 (-0400)
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=22bf63bb469327f77708d734d7277274ed4735ef;p=quix0rs-gnu-social.git

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

22bf63bb469327f77708d734d7277274ed4735ef