Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Tue, 29 Aug 2017 21:07:36 +0000 (23:07 +0200)
committerMichael Rasmussen <mir@datanom.net>
Tue, 29 Aug 2017 21:07:36 +0000 (23:07 +0200)

Trivial merge