From: Evan Prodromou <evan@status.net>
Date: Thu, 17 Mar 2011 13:20:32 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7cf12f093ed48849ec901038b4cfd44595343c06;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into testing

Conflicts:
	lib/common.php
---

7cf12f093ed48849ec901038b4cfd44595343c06