Index: lib/redmine/wiki_formatting.rb
===================================================================
--- lib/redmine/wiki_formatting.rb	(revision 1300)
+++ lib/redmine/wiki_formatting.rb	(working copy)
@@ -26,7 +26,7 @@
     class TextileFormatter < RedCloth
       
       # auto_link rule after textile rules so that it doesn't break !image_url! tags
-      RULES = [:textile, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]
+      RULES = [:textile, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros, :markdown]
       
       def initialize(*args)
         super