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

Conflicts:
	src/objectliterals.exports

2013-03-12 08:39:16 +01:00

..

ol

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

2013-03-12 08:39:16 +01:00