Merge branch 'master' into debian-jessie-backports

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

diff --git a/debian/changelog b/debian/changelog
index f3b65bd30808196671d39fabff27fabcbdb3c594..b33f3d30ffb79eaecaa8e505260fdad23a3e8540 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20150615) UNRELEASED; urgency=medium
+ikiwiki (3.20160121) unstable; urgency=medium
 
   [ Amitai Schlair ]
   * meta: Fix [[!meta name=foo]] by closing the open quote.
@@ -47,7 +47,13 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
   * img test: skip testing PDFs if unsupported
   * img test: use the right filenames when testing that deletion occurs
 
- -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100
+ -- 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