ahocevar 089b7013c2 Merge branch 'master' of github.com:openlayers/ol3 into vector ...

Conflicts:
	src/ol/renderer/canvas/canvasrenderer.js
	test/ol.html

2013-02-05 17:28:36 +01:00

..

ol

Merge branch 'master' of github.com:openlayers/ol3 into vector

2013-02-05 17:28:36 +01:00