From: Brion Vibber <brion@pobox.com>
Date: Wed, 10 Mar 2010 17:55:14 +0000 (-0800)
Subject: Merge branch 'testing' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ddb656fcd2a3233b26e28987d2f3425944908d30;p=quix0rs-gnu-social.git

Merge branch 'testing' into 0.9.x

Conflicts:
	actions/apistatusnetconfig.php
---

ddb656fcd2a3233b26e28987d2f3425944908d30