Merge branch 'master' into debian-jessie-backports

diff --git a/debian/changelog b/debian/changelog
index 96fef00cd5c85f68d95607dc3f4034a4c9d1763b..0eea2dbcace60a2aabb44d959b26b26c9df51c71 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,12 @@ ikiwiki (3.20160506) unstable; urgency=medium
 
  -- 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 ]
@@ -86,6 +92,12 @@ ikiwiki (3.20160121) unstable; urgency=medium
 
  -- 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