Tim Schaub 060edb2070 Merge branch 'vector' of github.com:openlayers/ol3 into vector ...

Conflicts:
	src/ol/style/shape.js

2013-03-06 02:28:33 +01:00

..

ol

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

2013-03-06 02:28:33 +01:00