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

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

diff --git a/debian/changelog b/debian/changelog
index 68c95e622add5b89d59c727afb72fc6fa8af680f..fa3e0cc4e998946434c73ed20f9857e79e076383 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ikiwiki (2.40) UNRELEASED; urgency=low
 
+  [ Josh Triplett ]
   * Add new preprocessor directive syntax¸ using a '!' prefix.  Add a
     prefix_directives option to the setup file to turn this syntax on;
     currently defaults to false, for backward compatibility.  Support
@@ -7,6 +8,9 @@ ikiwiki (2.40) UNRELEASED; urgency=low
     the underlay to support either setting of prefix_directives.  Add NEWS
     entry with migration information.
 
+  [ Joey Hess ]
+  * Danish translation update from Jonas Smedegaard. Closes: #465152
+
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
 ikiwiki (2.31.3) unstable; urgency=high