From: Simon McVittie <smcv@debian.org>
Date: Thu, 29 Dec 2016 20:47:46 +0000 (+0000)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e15a490067991448c3b65323ad9ecdc774dbfe4

Merge branch 'master' into debian-jessie-backports
---

2e15a490067991448c3b65323ad9ecdc774dbfe4
diff --cc debian/changelog
index 0e36f05c2,99081bcb0..1c989e515
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,20 @@@
+ 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
 +    - debian/tests/control: set INSTALLED_TESTS=1 here,
 +      pkg-perl-autopkgtest in jessie didn't support
 +      debian/tests/pkg-perl/smoke-env
 +
 + -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 17:38:19 +0000
 +
  ikiwiki (3.20161229) unstable; urgency=medium
  
    * Security: force CGI::FormBuilder->field to scalar context where