Merge branch 'master' into testing

Browse Source

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

...

This commit is contained in:

Evan Prodromou 2009-10-20 16:11:07 -04:00

parent d72748eb8e d3bbf3ad24

commit 65a3ccd458

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available