From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Aug 2011 17:11:28 +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=d55a3bf99d4d86c0011384efd9a35914001dc629;p=quix0rs-gnu-social.git

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

d55a3bf99d4d86c0011384efd9a35914001dc629