Merge branch 'master' of github.com:KaiRo-at/lantea
authorRobert Kaiser <kairo@kairo.at>
Mon, 18 Aug 2014 00:22:30 +0000 (02:22 +0200)
committerRobert Kaiser <kairo@kairo.at>
Mon, 18 Aug 2014 00:22:30 +0000 (02:22 +0200)
1  2 
js/map.js

diff --cc js/map.js
Simple merge