Ansis Brammanis 66c0a08d00 Merge remote-tracking branch 'systemed/master' into labels ...

Conflicts:
	js/id/renderer/map.js

2013-01-22 14:55:15 -05:00

..

app.css

Merge pull request #460 from systemed/fast-zoom

2013-01-22 09:26:35 -08:00

map.css

Merge remote-tracking branch 'systemed/master' into labels

2013-01-22 14:55:15 -05:00

reset.css

…