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

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

08018a1f7b74d5ae639712b9a2a9ab50056206ac