From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 1 Apr 2009 18:40:58 +0000 (-0400)
Subject: Merge branch '0.7.x' of git@gitorious.org:laconica/dev
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3bec08c878d50cfa43ffb72466842bda5dd88171;p=quix0rs-gnu-social.git

Merge branch '0.7.x' of git@gitorious.org:laconica/dev

Conflicts:
	README
	lib/router.php
---

3bec08c878d50cfa43ffb72466842bda5dd88171