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

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9bddf0733366d60653749d0a0e6ba09da4fdfc77..1abd4de4dc4c8244049442d83c5762657f62ea52 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
 
   * meta: Generate meta description tags even when the html scrubber is
     enabled.
+  * meta: Allow use of DESCRIPTION in templates to get at the meta description
+    value. (Thanks, NicolasLimare)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Nov 2009 15:46:45 -0500