From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 22:54:07 +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=f5bde9b6938e1f20b9eb4d20da366859ad88b5b3;p=quix0rs-gnu-social.git

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

f5bde9b6938e1f20b9eb4d20da366859ad88b5b3