From: Evan Prodromou <evan@status.net>
Date: Wed, 4 May 2011 20:05:06 +0000 (-0700)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=900b9ab498ba9a068f3183d72198179b7892f15e;p=quix0rs-gnu-social.git

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

900b9ab498ba9a068f3183d72198179b7892f15e