Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Sat, 23 Sep 2017 20:55:25 +0000 (22:55 +0200)
committerMichael Rasmussen <mir@datanom.net>
Sat, 23 Sep 2017 20:55:25 +0000 (22:55 +0200)

Trivial merge