From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 20:12:51 +0000 (-0500)
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=f8427f3d1e3ab89d41bd005dd560998fda0bd8b9;p=quix0rs-gnu-social.git

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

f8427f3d1e3ab89d41bd005dd560998fda0bd8b9