From: Brion Vibber <brion@pobox.com>
Date: Thu, 29 Apr 2010 22:14:51 +0000 (-0700)
Subject: Merge branch 'testing' into 0.9.x
X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=2260d6ec7c1f2b9c63196a4d8c6c99750a89eb10

Merge branch 'testing' into 0.9.x

Conflicts:
	index.php
---

2260d6ec7c1f2b9c63196a4d8c6c99750a89eb10