Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Sun, 18 Jun 2017 19:46:58 +0000 (21:46 +0200)
committerColin Leroy <colin@colino.net>
Sun, 18 Jun 2017 19:46:58 +0000 (21:46 +0200)

Trivial merge