Merge branch 'master' into debian-jessie-backports

diff --combined debian/changelog
index 59322743aff70095f253044ff482ad7a1204633c,1fed2c09696e1e460f6091a61bbc77b1a7b4f078..d9782380deb46b9a167cb75f991bcf0ba76696f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,23 @@@
- ikiwiki (3.20160728~bpo8+1) jessie-backports; urgency=medium
++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>  Thu, 28 Jul 2016 10:48:11 +0100
++ -- Simon McVittie <smcv@debian.org>  Mon, 05 Sep 2016 21:49:22 +0100
++
+ ikiwiki (3.20160905) unstable; urgency=medium
+ 
+   [ Joey Hess ]
+   * Fix installation when prefix includes a string metacharacter.
+     Thanks, Sam Hathaway.
+ 
+   [ Simon McVittie ]
+   * Use git log --no-renames to generate recentchanges, fixing the git
+     test-case with git 2.9 (Closes: #835612)
+ 
+  -- Simon McVittie <smcv@debian.org>  Mon, 05 Sep 2016 21:26:19 +0100
  
  ikiwiki (3.20160728) unstable; urgency=medium
  
@@@ -17,15 -20,6 +29,15 @@@
  
   -- 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 ]
@@@ -46,14 -40,6 +58,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 ]
@@@ -89,12 -75,6 +101,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 ]
@@@ -146,12 -126,6 +158,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