Merge remote-tracking branch 'anarcat/dev/decentralised_graphics'

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

diff --git a/debian/changelog b/debian/changelog
index ff2fe8220efa7e68dba25d77df5dbbabcd7b3dc8..0c36baf606f977e684d64d05e4321980fe1d98bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-ikiwiki (3.20140126) UNRELEASED; urgency=medium
+ikiwiki (3.20140228) UNRELEASED; urgency=medium
+
+  * only_committed_changes could fail in a git repository merged
+    with git merge -s ours.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 05 Apr 2014 19:08:22 -0400
+
+ikiwiki (3.20140227) unstable; urgency=medium
 
   * Added useragent config setting. Closes: #737121
     Thanks, Tuomas Jormola
@@ -21,10 +28,12 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
     Thanks, smcv
   * Improve templates testing.
     Thanks, smcv
+  * python proxy: Avoid utf-8 related crash.
+    Thanks, Antoine Beaupré
   * Special thanks to Simon McVittie for being the patchmeister for this
     release.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 01 Feb 2014 16:53:35 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Feb 2014 11:55:35 -0400
 
 ikiwiki (3.20140125) unstable; urgency=medium