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

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

fd803ea9ce48a65e143dbf6a167b5e00fa9043d5