From: Evan Prodromou <evan@status.net>
Date: Sun, 27 Mar 2011 15:26:57 +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=889b35be9c04b3eb03a7ad23b8a0e21288c0452d;p=quix0rs-gnu-social.git

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

889b35be9c04b3eb03a7ad23b8a0e21288c0452d