Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorPaul <paul@claws-mail.org>
Tue, 10 Apr 2018 07:14:21 +0000 (08:14 +0100)
committerPaul <paul@claws-mail.org>
Tue, 10 Apr 2018 07:14:21 +0000 (08:14 +0100)

Trivial merge