From: Evan Prodromou <evan@status.net>
Date: Tue, 2 Aug 2011 19:04:14 +0000 (-0400)
Subject: Merge branch 'master' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=513c54fa89085fde783a73c298d61576f834b131;p=quix0rs-gnu-social.git

Merge branch 'master' into 1.0.x

Conflicts:
	lib/common.php
---

513c54fa89085fde783a73c298d61576f834b131