From: Evan Prodromou <evan@status.net>
Date: Thu, 30 Dec 2010 23:52:08 +0000 (-0800)
Subject: Merge remote branch 'gitorious/0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=32eb4c5e2d13ff527494a1ca84e326fcf52cb5cb;p=quix0rs-gnu-social.git

Merge remote branch 'gitorious/0.9.x' into 1.0.x

Conflicts:
	lib/common.php
---

32eb4c5e2d13ff527494a1ca84e326fcf52cb5cb