From: Zach Copley <zach@status.net>
Date: Wed, 4 May 2011 23:13:42 +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=c4aef15a153e961a3a5341d3b3864fdb9b664bb8;p=quix0rs-gnu-social.git

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

c4aef15a153e961a3a5341d3b3864fdb9b664bb8