Merge branch 'master' of linz:/srv/git/git-kairo
authorRobert Kaiser <kairo@kairo.at>
Tue, 11 Sep 2012 15:25:50 +0000 (17:25 +0200)
committerRobert Kaiser <kairo@kairo.at>
Tue, 11 Sep 2012 15:25:50 +0000 (17:25 +0200)
1  2 
js/map.js

diff --cc js/map.js
Simple merge