Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <robert@widebook.box.kairo.at>
Thu, 3 Jul 2014 19:32:17 +0000 (21:32 +0200)
committerRobert Kaiser <robert@widebook.box.kairo.at>
Thu, 3 Jul 2014 19:32:17 +0000 (21:32 +0200)
1  2 
js/map.js

diff --cc js/map.js
Simple merge