Merge branch 'master' into testing
authorEvan Prodromou <evan@status.net>
Tue, 20 Oct 2009 20:11:07 +0000 (16:11 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 20 Oct 2009 20:11:07 +0000 (16:11 -0400)
commit65a3ccd4587193bba72501837fab097e041f96d3
treed273a4dc9596f3a72ebae1b657cfd36b437dda66
parentd72748eb8e71f81e7cddca610ec98a8910dd347f
parentd3bbf3ad24c27522694bfaed437897273069a1e8
Merge branch 'master' into testing

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