Merge commit 'smcv/master'

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

diff --git a/debian/changelog b/debian/changelog
index f2ead8bad3cc97e3680a40122968f6642ae3b06f..0694b81907d4afaaeec5e7ef4a3ce19b97e1b712 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ ikiwiki (2.54) UNRELEASED; urgency=low
   * Change deb dependencies to list Text::Markdown before markdown, since
     the former, while slower, has a much better html parser that avoids
     numerous bugs.
-  * meta: Support a uuid option, to allow forcing a particular uuid
-    in feeds.
+  * meta: Support a guid option, to allow forcing a particular url or
+    uuid in feeds. (smcv)
+  * Move yesno function out of inline and into IkiWiki core, not exported.
 
  -- Josh Triplett <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700