Merge branch 'master' into comments

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1ff78d7493af49d7d9d8580adb37ac92f94cfe5f..bf14860dd1251e99ef0e1f865e3a2f01c09814d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * inline: Support emptyfeeds=no option to skip generating empty feeds.
   * inline: Support feedfile option to change the filename of the feed
     generated.
+  * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500