Re: [mkgmap-dev] Merging branches