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)

Trivial merge