From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Sep 2011 20:15:52 +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=a1fd6e0fa493ecffb25a2e2af4aba5dc4c984824;p=quix0rs-gnu-social.git

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

a1fd6e0fa493ecffb25a2e2af4aba5dc4c984824