Merge branch 'master' into osm

Conflicts:
	notes/2.12.md
This commit is contained in:
Éric Lemoine
2012-01-17 09:10:27 +01:00
17 changed files with 256 additions and 21 deletions
-1
View File
@@ -280,7 +280,6 @@ Group: OpenLayers {
} # Group: Handler
File: Icon (no auto-title, OpenLayers/Icon.js)
File: Kinetic (no auto-title, OpenLayers/Kinetic.js)
Group: Lang {