From: Evan Prodromou <evan@status.net>
Date: Tue, 26 Jul 2011 18:52:05 +0000 (-0700)
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=8844b373b415629209aaa2b71c4eb44e9bf083d0;p=quix0rs-gnu-social.git

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

8844b373b415629209aaa2b71c4eb44e9bf083d0