3.20160506

diff --git a/debian/NEWS b/debian/NEWS
index 66b2b4299608ba22771e9133a4f80d36f65f6d37..e169658ea28b4f362b5528a98a34daad4e4e7848 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.20160506) UNRELEASED; urgency=medium
+ikiwiki (3.20160506) unstable; urgency=medium
 
   To mitigate CVE-2016-3714 and similar ImageMagick security vulnerabilities,
   the [[!img]] directive is now restricted to these common web formats by
@@ -20,7 +20,7 @@ ikiwiki (3.20160506) UNRELEASED; urgency=medium
   or <file:///usr/share/doc/ikiwiki/html/ikiwiki/directive/img.html> for
   more details.
 
- -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:07:29 +0100
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:49:56 +0100
 
 ikiwiki (3.20150610) unstable; urgency=low
 

diff --git a/debian/changelog b/debian/changelog
index 02894877df30737281e6adc8ef0ff8cddd2f9665..96fef00cd5c85f68d95607dc3f4034a4c9d1763b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20160122) UNRELEASED; urgency=medium
+ikiwiki (3.20160506) unstable; urgency=medium
 
   [ Simon McVittie ]
   * img: stop ImageMagick trying to be clever if filenames contain a colon,
@@ -30,7 +30,10 @@ ikiwiki (3.20160122) UNRELEASED; urgency=medium
   [ Amitai Schlair ]
   * mdwn: Process .md like .mdwn, but disallow web creation.
 
- -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 22:34:04 +0000
+  [ Florian Wagner ]
+  * git: Correctly handle filenames starting with a dash in add/rm/mv.
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
 
 ikiwiki (3.20160121) unstable; urgency=medium