From: Evan Prodromou <evan@status.net>
Date: Tue, 30 Nov 2010 19:46:26 +0000 (-0500)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7aa201fa5285d8dfe31ab6f254bfaa9819c65285;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x

Conflicts:
	lib/router.php
---

7aa201fa5285d8dfe31ab6f254bfaa9819c65285