Merge branch 'master' into debian-jessie-backports

diff --combined debian/changelog
index 0e36f05c235527d3fe6c0092aab5366efccc5975,99081bcb091be2824cbf0f17fa2747089d425069..1c989e5155ebfdd710ce919ff978886040f62e90
--- 1/debian/changelog
--- 2/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
@@@ -51,15 -50,6 +59,15 @@@ ikiwiki (3.20161219) unstable; urgency=
  
   -- Simon McVittie <smcv@debian.org>  Mon, 19 Dec 2016 20:34:23 +0000
  
 +ikiwiki (3.20160905~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>  Mon, 05 Sep 2016 21:49:22 +0100
 +
  ikiwiki (3.20160905) unstable; urgency=medium
  
    [ Joey Hess ]
@@@ -82,15 -72,6 +90,15 @@@ ikiwiki (3.20160728) unstable; urgency=
  
   -- Simon McVittie <smcv@debian.org>  Thu, 28 Jul 2016 10:41:56 +0100
  
 +ikiwiki (3.20160509~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>  Mon, 09 May 2016 22:19:05 +0100
 +
  ikiwiki (3.20160509) unstable; urgency=high
  
    [ Amitai Schlair ]
@@@ -111,14 -92,6 +119,14 @@@
  
   -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 21:57:09 +0100
  
 +ikiwiki (3.20160506~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>  Fri, 06 May 2016 08:58:18 +0100
 +
  ikiwiki (3.20160506) unstable; urgency=medium
  
    [ Simon McVittie ]
@@@ -154,12 -127,6 +162,12 @@@
  
   -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
  
 +ikiwiki (3.20160121~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 10:18:07 +0000
 +
  ikiwiki (3.20160121) unstable; urgency=medium
  
    [ Amitai Schlair ]
@@@ -211,12 -178,6 +219,12 @@@
  
   -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 09:53:07 +0000
  
 +ikiwiki (3.20150614~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports, no source changes (Closes: #807452)
 +
 + -- Simon McVittie <smcv@debian.org>  Mon, 18 Jan 2016 07:03:11 +0000
 +
  ikiwiki (3.20150614) unstable; urgency=medium
  
    * inline: change default sort order from age to "age title" for