From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 19:00:22 +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=f4ff375dbd1b4cc8e3964a2d2be2d68140b0b135;p=quix0rs-gnu-social.git

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

f4ff375dbd1b4cc8e3964a2d2be2d68140b0b135