fixed filepath, better timestamp
Creation of mergetestcase in progress
Merge branch 'master' of https://github.com/paivola/mapserver
fixed windows filepath, extra column
Merge branch 'master' of https://github.com/paivola/mapserver