From: Evan Prodromou <evan@status.net>
Date: Sat, 7 Nov 2009 18:01:24 +0000 (-0500)
Subject: Merge branch '0.8.x' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2d8ad0409d8e78ec35a65156bc375eacbe561963;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into 0.9.x

Conflicts:
	lib/common.php
---

2d8ad0409d8e78ec35a65156bc375eacbe561963