Merge branch 'master' into extra

Conflicts:

	License.text
This commit is contained in:
Michel Fortin 2008-05-11 07:20:06 -04:00
commit c10f487ec9

View file

@ -1,5 +1,5 @@
PHP Markdown & Extra
Copyright (c) 2004-2007 Michel Fortin
Copyright (c) 2004-2008 Michel Fortin
<http://www.michelf.com/>
All rights reserved.