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

[www/ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 57fe7861c15cb43180c11c14309b63793aac9cad..d196b49b9c72510b0034a45ecba31e93c0a601b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,12 @@ 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 non-text files are added in binary mode. (Amitai Schlair)
+  * 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