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

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

77441beb978b0b7958d5cbdf15d294a2e436f8cd