From: Evan Prodromou <evan@status.net>
Date: Mon, 30 May 2011 19:37:46 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=412adfb587e6796cf9db060ed5f749063a5c9fd0;p=quix0rs-gnu-social.git

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

412adfb587e6796cf9db060ed5f749063a5c9fd0