From: Evan Prodromou <evan@status.net>
Date: Tue, 20 Oct 2009 20:11:07 +0000 (-0400)
Subject: Merge branch 'master' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65a3ccd4587193bba72501837fab097e041f96d3;hp=-c;p=quix0rs-gnu-social.git

Merge branch 'master' into testing

Conflicts:
	lib/util.php
	tests/URLDetectionTest.php
---

65a3ccd4587193bba72501837fab097e041f96d3