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

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

5304373b0b5c9905b30c85b565c23246d377467b