Merge remote branch 'upstream/master' into prv/po

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d426be0196a6f35bd3b34202f5da63268ecc6419..c340f89019fdd848efd11badfea67f159c3cc465 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 ikiwiki (3.20100705) UNRELEASED; urgency=low
 
   * img: Add a margin around images displayed by this directive.
+  * comments: Added commentmoderation directive for easy linking to the
+    comment moderation queue.
+  * aggregate: Write timestamp next aggregation can happen to
+    .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
+  * Add --changesetup mode that allows easily changing options in a
+    setup file.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400