Merge branch 'master' into comments

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

diff --git a/debian/changelog b/debian/changelog
index bf14860dd1251e99ef0e1f865e3a2f01c09814d7..76f00157d0d3bf92d711e07c5f8cfff748194393 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * inline: Support feedfile option to change the filename of the feed
     generated.
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
+  * htmlbalance: don't compact whitespace, and set misc other options (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500