X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7a2117bf8c2cf5372e64ab7b368803eec7e6f5d7..ee13598aa8370670fc4caf3a1e0982021656d9bf:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 2b79e51ab..d61da928f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,22 @@
-ikiwiki (3.20150611) UNRELEASED; urgency=medium
+ikiwiki (3.20150615) UNRELEASED; urgency=medium
 
-  * inline: change default sort order from age to "age title" for determinism
+  [ Amitai Schlair ]
+  * meta test: Add tests for many behaviors of the directive.
+  * img test: Bail gracefully when ImageMagick is not present.
+  * meta: Fix [[!meta name=foo]] by closing the open quote.
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100
+
+ikiwiki (3.20150614) unstable; urgency=medium
+
+  * inline: change default sort order from age to "age title" for
+    determinism, partially fixing deterministic build for git-annex,
+    ikiwiki-hosting etc. (Closes: #785757)
   * img: avoid ImageMagick misinterpreting filenames containing a colon
+  * img test: set old timestamp on source file that will change, so that
+    the test will pass even if it takes less than 1 second
 
- -- Simon McVittie <smcv@debian.org>  Thu, 11 Jun 2015 08:32:35 +0100
+ -- Simon McVittie <smcv@debian.org>  Sun, 14 Jun 2015 18:13:23 +0100
 
 ikiwiki (3.20150610) unstable; urgency=low