Tim Schaub 176f18c937 Merge branch 'master' of github.com:openlayers/ol3 into vector ...

Resolved conflicts:
  src/ol/renderer/canvas/canvasrenderer.js

2013-02-20 00:38:07 -07:00

..

ol

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

2013-02-20 00:38:07 -07:00