Merge branch 'vendor/DIFFUTILS'
authorSascha Wildner <saw@online.de>
Tue, 19 Jun 2018 19:24:53 +0000 (21:24 +0200)
committerSascha Wildner <saw@online.de>
Tue, 19 Jun 2018 19:24:53 +0000 (21:24 +0200)

Trivial merge