Merge branch 'master' into cvs

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9c4e83c2f0fa50423b65ce0b23546b048016348e..d014abd50e0c4a6cf18dcf8d9fe3c998e0b08b9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
+ikiwiki (3.20120116) UNRELEASED; urgency=low
+
+  * mdwn: Added nodiscount setting, which can be used to avoid using the
+    markdown discount engine, when maximum compatability is needed.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
+

 ikiwiki (3.20120115) unstable; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
 ikiwiki (3.20120115) unstable; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.

-  * Workaround discount's eliding of <style> blocks.
+  * mdwn: Workaround discount's eliding of <style> blocks.
+  * attachment: Fix utf-8 display bug.

 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 16:19:25 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 16:19:25 -0400