Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Sun, 7 Oct 2018 09:11:29 +0000 (11:11 +0200)
committerColin Leroy <colin@colino.net>
Sun, 7 Oct 2018 09:11:29 +0000 (11:11 +0200)

Trivial merge