X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fbfcea89f8e06426c73ab8ea369ca4cdc566db6f..74a9e4364a820f0ff570a364fae31daf576f6539:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c7e4b1d11..40fd86ed0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,28 @@
+ikiwiki (3.20120630) UNRELEASED; urgency=low
+
+  * recentchangesdiff: When diffurl is not set, provide inline diffs
+    in the recentchanges page, with visibility toggleable via javascript.
+    Thanks, Antoine Beaupré
+  * Split CFLAGS into words when building wrapper. Closes: #682237
+  * osm: Avoid calling urlto before generated files are registered.
+    Thanks, Philippe Gauthier and Antoine Beaupré
+  * osm: Add osm_openlayers_url configuration setting.
+    Thanks, Genevieve
+  * 
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
+
+ikiwiki (3.20120629) unstable; urgency=low
+
+  * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or
+    other config differences by linking to the mirror's CGI. (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 29 Jun 2012 10:16:08 -0400
+
 ikiwiki (3.20120516) unstable; urgency=high
 
   * meta: Security fix; add missing sanitization of author and authorurl.
-    Thanks, Raúl Benencia
+    CVE-2012-0220 Thanks, Raúl Benencia
 
  -- Joey Hess <joeyh@debian.org>  Wed, 16 May 2012 19:51:27 -0400