Commit PHP Markdown Extra 1.2.4
Commit PHP Markdown Extra 1.2.5
Commit PHP Markdown Extra 1.2.6
Commit PHP Markdown Extra 1.2.7
Add Geshi support
Merge branch 'upstream' (early part) into geshi

Conflicts:
	markdown.php
Merge branch 'upstream' (early part) into geshi

Conflicts:
	markdown.php
Merge branch 'upstream' into geshi

Conflicts:
	markdown.php