merged anarcat's osm fixes

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

diff --git a/debian/changelog b/debian/changelog
index a77c42e425f88f2f4864214a38958ceb85497f58..bf4ff9db1474594653aac445748f9155fb9a9039 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     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