artemp 7544f57efe Merge branch 'master' into json-properties		2016-05-06 10:27:18 +02:00
..
mapnik	Merge branch 'master' into json-properties	2016-05-06 10:27:18 +02:00
build.py	revert geometry changes for now - will develop them in branch to reduce downstream breakage	2016-04-11 14:00:27 -07:00