Merge branch 'master' into debian-jessie-backports

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

diff --git a/debian/changelog b/debian/changelog
index 0e36f05c235527d3fe6c0092aab5366efccc5975..1c989e5155ebfdd710ce919ff978886040f62e90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20161229.1) unstable; urgency=medium
+
+  * git: Attribute reverts to the user doing the revert, not the wiki
+    itself.
+  * git: Do not disable the commit hook while preparing a revert.
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 20:46:24 +0000
+
 ikiwiki (3.20161229~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports