move
Merge branch 'master' of github.com:paivola/mapserver