Merge branch 'master' of git://git.ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index 57a27d82f0af94fe2ac74df17ff8d15c6dfb39f4..d196b49b9c72510b0034a45ecba31e93c0a601b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,26 @@
-ikiwiki (3.20111230) UNRELEASED; urgency=low
+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.
+  * 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, prettydate: 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>  Mon, 16 Jan 2012 13:41:14 -0400
+
+ikiwiki (3.20120115) unstable; urgency=low
+
+  * Make backlink(.) work. Thanks, Giuseppe Bilotta.
+  * 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
+
+ikiwiki (3.20120109) unstable; urgency=low
 
   * mdwn: Can use the discount markdown library, via the
     Text::Markdown::Discount perl module. This is preferred if available
@@ -8,7 +30,7 @@ ikiwiki (3.20111230) UNRELEASED; urgency=low
     is still used.)
   * On Debian, depend on libtext-markdown-discount.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 01 Jan 2012 16:22:24 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Jan 2012 11:49:14 -0400
 
 ikiwiki (3.20111229) unstable; urgency=low