X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c29413ba2a7dd4236efc75be92de82d452557c7b..181a83963eba9689db5b0e377c1edb28c0e191bd:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 8b1054b42..d1d132e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,28 @@
-ikiwiki (3.20121018) UNRELEASED; urgency=low
+ikiwiki (3.20121213) UNRELEASED; urgency=low
+
+  * htmlscrubber: Allow the bitcoin URI scheme.
+  * htmlscrubber: Allow the URI schemes of major VCS's.
+  * aggregate: When run with --aggregate, if an aggregation is already
+    running, don't go on and --refresh.
+  * trail: Avoid excess dependencies between pages in the trail
+    and the page defining the trail. Thanks, smcv.
+  * opendiscussion: Don't allow editing discussion pages if discussion pages
+    are disabled. (smcv)
+  * poll: Add expandable option to allow users to easily add new choices to
+    a poll.
+  * trail: Avoid massive slowdown caused by pagetemplate hook when displaying
+    dynamic cgi pages, which cannot use trail anyway.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400
+
+ikiwiki (3.20121212) unstable; urgency=low
 
   * filecheck: Fix bug that prevented File::MimeInfo::Magic from ever
     being used.
   * openid: Display openid in Preferences page as a comment, so it can be
     selected in all browsers.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 04 Nov 2012 11:59:10 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 11 Dec 2012 12:12:12 -0400
 
 ikiwiki (3.20121017) unstable; urgency=low