From: Evan Prodromou <evan@status.net>
Date: Mon, 20 Jun 2011 16:23:16 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f078c19f09e067408d1e300dc9cecab1d4d8df62;hp=-c;p=quix0rs-gnu-social.git

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

f078c19f09e067408d1e300dc9cecab1d4d8df62