X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/002a97ffcdf347b8ad97210ddb5badacd3fee712..154c4ea9e:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ce8f833fb..41559ea37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20130904.2) UNRELEASED; urgency=low
+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.
   * poll: Fix behavior of poll buttons when inlined.
@@ -12,12 +20,18 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
     break some setups where not all files get committed to git.
   * comments: Write pending moderation comments to the transient underlay
     to avoid conflict with only_committed_changes.
-  * search: Added googlesearch option, which makes it search google
+  * search: Added google_search option, which makes it search google
     rather than using the internal xapain database.
     (googlesearch plugin is too hard to turn on when xapain databases
     corrupt themselves, which happens all too frequently).
-
- -- Joey Hess <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400
+  * osm: Remove invalid use of charset on embedded javascript tags.
+    Closes: #731197
+  * 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.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Jan 2014 12:22:22 -0400
 
 ikiwiki (3.20130904.1) unstable; urgency=low