From: Evan Prodromou <evan@status.net>
Date: Mon, 10 Jan 2011 19:59:07 +0000 (-0500)
Subject: Merge remote branch 'gitorious/testing' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ca57e32aa25daae3bbf69987d2ec12899e4e173;p=quix0rs-gnu-social.git

Merge remote branch 'gitorious/testing' into testing
---

7ca57e32aa25daae3bbf69987d2ec12899e4e173