From: Zach Copley <zach@status.net>
Date: Thu, 5 May 2011 22:00:16 +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=fc62a8f980bc8706b5aea13bc0be24837d027043;p=quix0rs-gnu-social.git

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

fc62a8f980bc8706b5aea13bc0be24837d027043