From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 31 Mar 2009 14:14:54 +0000 (-0400)
Subject: Merge branch 'master' into 0.7.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c2e6fb668df99e6c6249a6009202db3e305aae71;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.7.x

Conflicts:
	README
	lib/router.php
---

c2e6fb668df99e6c6249a6009202db3e305aae71