From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Aug 2011 22:03:30 +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=c0bae505d91620b4af14431bc6fe706d84013f16;p=quix0rs-gnu-social.git

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

c0bae505d91620b4af14431bc6fe706d84013f16