From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 23:09:50 +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=e7843dfda277e10904caf6e8212928f7ec271009;p=quix0rs-gnu-social.git

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

e7843dfda277e10904caf6e8212928f7ec271009