From: Evan Prodromou <evan@status.net>
Date: Mon, 4 Apr 2011 21:35:34 +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=747748a0faf8cccb780cf8b09941119e0a38cc29;p=quix0rs-gnu-social.git

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

747748a0faf8cccb780cf8b09941119e0a38cc29