From: Brion Vibber <brion@pobox.com>
Date: Wed, 1 Dec 2010 00:34:52 +0000 (-0800)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=749367e12f9742d7fd5ee028230fefa627599125;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/router.php
---

749367e12f9742d7fd5ee028230fefa627599125