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

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

8b47400183052873b012dacf4eb5ba841914a886