Merge merkaartor (0.18.3+ds-5) import into refs/heads/workingbranch
authorBas Couwenberg <sebastic@debian.org>
Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)
committerBas Couwenberg <sebastic@debian.org>
Tue, 31 Jul 2018 21:55:34 +0000 (22:55 +0100)
commitc61b44d2acfbba8c634c15dd7fc41a5af1d059ec
tree1047cac07aab154af26457eb57955dc6e31c31e2
parent5e9e9bb92a4a1a7a8d530c7bcd1b709280074aac
parentd00f5f9883dbe02122def2f4fc26beb2fb231545
Merge merkaartor (0.18.3+ds-5) import into refs/heads/workingbranch