From: Evan Prodromou <evan@status.net>
Date: Sun, 17 Apr 2011 21:00:54 +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=5e50acb23b993e5f8d481ff77b7e13760f123ebe;p=quix0rs-gnu-social.git

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

5e50acb23b993e5f8d481ff77b7e13760f123ebe