From: Evan Prodromou <evan@status.net>
Date: Tue, 23 Aug 2011 04:17:39 +0000 (-0400)
Subject: Merge branch '1.0.x' into activity
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c712eefe14bf7afb282f29bdac6f3199cf187c04;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into activity
---

c712eefe14bf7afb282f29bdac6f3199cf187c04