Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Wed, 11 Apr 2018 10:19:11 +0000 (12:19 +0200)
committerwwp <wwp@free.fr>
Wed, 11 Apr 2018 10:19:11 +0000 (12:19 +0200)

Trivial merge