From: Evan Prodromou <evan@status.net>
Date: Wed, 3 Mar 2010 23:20:45 +0000 (-0500)
Subject: Merge branch 'testing'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f1c6e239acbf2c024c3aae9819d891f02b05bfd;p=quix0rs-gnu-social.git

Merge branch 'testing'
---

0f1c6e239acbf2c024c3aae9819d891f02b05bfd