From: Zach Copley <zach@status.net>
Date: Fri, 11 Mar 2011 01:16:28 +0000 (-0800)
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=3730b650ab32e03eb5365e56ce87d43164d59946;hp=-c;p=quix0rs-gnu-social.git

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

3730b650ab32e03eb5365e56ce87d43164d59946