Merge branch 'master' into extra

Conflicts: License.text
michelf · May 11, 2008 · c10f487 · c10f487
2 parents ff6ace4 + 8199d0c
commit c10f487
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/License.text b/License.text
@@ -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.