Merge branch 'vendor/DIFFUTILS'
authorSascha Wildner <saw@online.de>
Sat, 7 Jul 2018 21:03:23 +0000 (23:03 +0200)
committerSascha Wildner <saw@online.de>
Sat, 7 Jul 2018 21:03:23 +0000 (23:03 +0200)

Trivial merge