From: Evan Prodromou <evan@status.net>
Date: Wed, 3 Aug 2011 14:42:50 +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=1c05ed08453ab4f39687957ec61be61f3b978cf4;p=quix0rs-gnu-social.git

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

1c05ed08453ab4f39687957ec61be61f3b978cf4