Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Fri, 9 Feb 2018 19:40:26 +0000 (20:40 +0100)
committerMichael Rasmussen <mir@datanom.net>
Fri, 9 Feb 2018 19:40:26 +0000 (20:40 +0100)

Trivial merge