From: Evan Prodromou <evan@status.net>
Date: Fri, 10 Dec 2010 22:04:55 +0000 (-0500)
Subject: Merge branch '0.9.x' into activityatompub
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=167f760ab8c0b80652a1aab88a88fd207091d714;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into activityatompub

Conflicts:
	lib/router.php
---

167f760ab8c0b80652a1aab88a88fd207091d714