Merge branch 'master' into newui

2011-09-26 11:42:48 +02:00
parent 991656a3ef 428e676641
commit 5792b3d358
246 changed files with 7155 additions and 12678 deletions
--- a/library/markdown.php
+++ b/library/markdown.php
@@ -1528,7 +1528,7 @@ class Markdown_Parser {
 				|
 					<\?.*?\?> | <%.*?%>		# processing instruction
 				|
-					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
+					<[/!$]?[-a-zA-Z0-9:_]+	# regular tags
 					(?>
 						\s
 						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*