From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Jun 2010 19:38:35 +0000 (-0700)
Subject: Merge branch 'testing' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9684cbe3c6d61be0b1cc2094bc4278cd8a21b33e;p=quix0rs-gnu-social.git

Merge branch 'testing' into 0.9.x

Conflicts:
	plugins/OpenID/openidserver.php
---

9684cbe3c6d61be0b1cc2094bc4278cd8a21b33e