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

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

74387e75cf1f521bfdea0a8d635730ee6fb49d9d