From: Evan Prodromou <evan@status.net>
Date: Sat, 9 Apr 2011 19:38:39 +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=8b46624d19b7d95045c355f116e5d6ca66776e1c;p=quix0rs-gnu-social.git

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

8b46624d19b7d95045c355f116e5d6ca66776e1c