Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index 40fd86ed0a3d1044437d68221b8021e031c9c19e..8c1c685be33f540a15627907dc1e44de3dc9256e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,9 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     Thanks, Philippe Gauthier and Antoine Beaupré
   * osm: Add osm_openlayers_url configuration setting.
     Thanks, Genevieve
-  * 
+  * osm: osm_layers can be used to configured the layers displayed on the map.
+    Thanks, Antoine Beaupré
+  * comments: Remove ipv6 address specific code.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400