pre-merge commit
Merge branch 'master' of ssh://github.com/computerion/MapCache
pre-merge
Merge branch 'master' of ssh://github.com/computerion/MapCache
maps files pre-merge
merged
quasi-workiong copy