From: Evan Prodromou <evan@status.net>
Date: Thu, 7 Apr 2011 02:52:14 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=68b1c057056a5db7601683383f7e466031d336bc;p=quix0rs-gnu-social.git

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

68b1c057056a5db7601683383f7e466031d336bc