From: Zach Copley <zach@status.net>
Date: Tue, 1 Mar 2011 23:26:02 +0000 (-0800)
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=243b39666064dfa1eee85f08fadae2467ca4612e;p=quix0rs-gnu-social.git

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

243b39666064dfa1eee85f08fadae2467ca4612e