Merge remote-tracking branch 'smcv/ready/trail'

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

diff --git a/debian/changelog b/debian/changelog
index 6f13b2dd564e9c4a37591dc77383e259ee7ee905..edd0f2cc13cb2bda681f33cf9adddc52053781ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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.
+  * opendiscussion: Don't allow editing discussion pages if discussion pages
+    are disabled. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400