Éric Lemoine eac8bb5307 Merge remote branch 'ahocevar/wmtscaps' into wmtscaps ...

Conflicts:
	lib/OpenLayers/Format/OWSCommon/v1.js
	tests/Format/WMTSCapabilities/v1_0_0.html

2011-11-07 22:53:55 +01:00

..

v1_0_0.html

Merge remote branch 'ahocevar/wmtscaps' into wmtscaps

2011-11-07 22:53:55 +01:00