From: Evan Prodromou <evan@status.net>
Date: Sat, 31 Oct 2009 18:36:04 +0000 (-0400)
Subject: merge from testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e9ec0d0e1aeb43b432f4692b4819beb9408ad3b;p=quix0rs-gnu-social.git

merge from testing
---

4e9ec0d0e1aeb43b432f4692b4819beb9408ad3b