Merge commit '6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c'

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

diff --git a/debian/changelog b/debian/changelog
index abc40a163d068a23f446fd218f13f68533cbb210..948fdcc8445c48734dd6adaeb0050c46dbd7ce5b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 ikiwiki (3.20121213) UNRELEASED; urgency=low
 
   * htmlscrubber: Allow the bitcoin URI scheme.
+  * aggregate: When run with --aggregate, if an aggregation is already
+    running, don't go on and --refresh.
+  * trail: Converted all dependencies to presence dependencies.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400