From: Evan Prodromou <evan@status.net>
Date: Mon, 18 Jul 2011 19:50:08 +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=94c50194c158f3f9a11632ac0a36e580f7910a35;p=quix0rs-gnu-social.git

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

94c50194c158f3f9a11632ac0a36e580f7910a35