prep release

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d4fb9b7d5d9e233db1762c07da8b16e6dbd25a4f..41559ea37933166fb9cf26941479ae2cb57cace0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20140125) unstable; urgency=medium
+
+  * inline: Allow overriding the title of the feed. Closes: #735123
+    Thanks, Christophe Rhodes
+  * osm: Escape name parameter. Closes: #731797
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 25 Jan 2014 16:40:32 -0400
+
 ikiwiki (3.20140102) unstable; urgency=low
 
   * aggregate: Improve display of post author.
@@ -18,7 +26,7 @@ ikiwiki (3.20140102) unstable; urgency=low
     corrupt themselves, which happens all too frequently).
   * osm: Remove invalid use of charset on embedded javascript tags.
     Closes: #731197
-  * style.css: Add compatability definitions for more block-level
+  * style.css: Add compatibility definitions for more block-level
     html5 elements. Closes: #731199
   * aggregrate: Fix several bugs in handling of empty and colliding
     titles when generating filenames.