From: Zach Copley <zach@status.net>
Date: Wed, 6 Jul 2011 00:30:01 +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=038ee13e79e969450d8e56e1705662ce7f0edf73;p=quix0rs-gnu-social.git

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

038ee13e79e969450d8e56e1705662ce7f0edf73