X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b38261a03aab649e3b194b7d1983536eee8a3684..c8f7b96909286407cfe4e52add0d98044cc21c4e:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index e60f87f29..c8db76966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
-ikiwiki (3.20120115) UNRELEASED; urgency=low
+ikiwiki (3.20120202) unstable; urgency=low
+
+  * mdwn: Added nodiscount setting, which can be used to avoid using the
+    markdown discount engine, when maximum compatability is needed.
+  * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
+  * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
+  * cvs: Various cleanups and testing. (Amitai Schlair)
+  * calendar: Fix strftime encoding bug.
+  * shortcuts: Fixed a broken shortcut to wikipedia (accidentially
+    made into a shortcut to wikiMedia).
+  * Various portability improvements. (Amitai Schlair)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Feb 2012 21:42:40 -0400
+
+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>  Fri, 13 Jan 2012 13:43:14 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 16:19:25 -0400
 
 ikiwiki (3.20120109) unstable; urgency=low