Merge branch 'master' into fancypodcast

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

diff --git a/debian/changelog b/debian/changelog
index b9b46be3d840b5439a36b91996fd2b3f407f9255..d98af52cffefbc486c65210a62edf2833025a55b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low
   * comments: The formats allowed to be used in comments can be configured
     using comments_allowformats.
     Thanks, Michal Sojka
+  * calendar: When there are multiple pages for a given day, they're
+    displayed in a popup on mouseover.
+    Thanks, Louis
+  * osm: Remove trailing slash from KML maps icon.
+  * page.tmpl: omit searchform, trails, sidebar and most metadata in CGI
+    (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 23 Jun 2013 14:02:01 -0400