From: Zach Copley <zach@status.net>
Date: Fri, 22 Oct 2010 18:23:37 +0000 (-0700)
Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ae557ed43643b30e50a6d5b754c53c7f7205e76f;p=quix0rs-gnu-social.git

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

ae557ed43643b30e50a6d5b754c53c7f7205e76f