Bryan Housel 1a8ef310c6 Merge branch 'master' into preset-cleanup ...

Conflicts:
	data/presets/presets.json
	data/presets/presets/amenity/post_office.json

2014-08-25 14:05:49 -04:00

..

img

restore maki sprite

2014-05-22 12:16:28 +02:00

locales

Merge branch 'master' into preset-cleanup

2014-08-25 14:05:49 -04:00

index.html

Add IE standards incantations

2013-10-25 13:02:59 -07:00

land.html

…