Merge remote-tracking branch 'schmonz/portability'

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

diff --git a/debian/changelog b/debian/changelog
index dbc9b16a555f89b1eb29bd2a6dc650ceca9e2616..8fa3f5b2d4fc9c4af4afe733984080a819af3537 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ 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).
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400