Merge branch 'master' into comments

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 727447023178f7fdda51f83179216d038dde1cb7..b884dd596cd43e366c33f2f8b6beb28e40ecef49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ ikiwiki (2.71) UNRELEASED; urgency=low
     generated.
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
   * htmlbalance: don't compact whitespace, and set misc other options (smcv)
+  * rename: Fix double-escaping of page name in edit box.
+  * monotone: When getting the log, tell monotone how many entries
+    we want, rather than closing the pipe, which it dislikes. (thm)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500