From: Evan Prodromou <evan@status.net>
Date: Tue, 17 Nov 2009 13:04:14 +0000 (-0500)
Subject: Merge branch '0.9.x' into adminpanel
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bac2d80c919a78d5cafd57f712872a90cda04847;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into adminpanel

Conflicts:
	classes/User.php
---

bac2d80c919a78d5cafd57f712872a90cda04847