From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 02:01:36 +0000 (-0800)
Subject: Merge branch '1.0.x' into profile-fixups
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c6f9baf78cce7ca2e2e5d2f6c4752209e0a74616;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into profile-fixups
---

c6f9baf78cce7ca2e2e5d2f6c4752209e0a74616