X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e1a0b25be1996979571751756abfbcddc06231bc..59cfb9b6d0f5f60516d17c79365318711a92fb04:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7fa1cbdf7..0c36baf60 100644
--- 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
@@ -19,10 +26,14 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
   * Cleanup of the openid login widget, including replacing of hotlinked
     images from openid providers with embedded, freely licensed artwork.
     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