Dominik Moritz 2d26afb435 Merge branch 'master' into markercluster
Conflicts:
	src/view.map.js
2012-09-25 11:49:16 +01:00
..