Merge kdiff3 (1.8.5-1) import into refs/heads/workingbranch
authorPino Toscano <pino@debian.org>
Thu, 21 Jan 2021 10:40:18 +0000 (10:40 +0000)
committerPino Toscano <pino@debian.org>
Thu, 21 Jan 2021 10:40:18 +0000 (10:40 +0000)

Trivial merge