Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorPaul <paul@claws-mail.org>
Sun, 8 Apr 2018 18:32:04 +0000 (19:32 +0100)
committerPaul <paul@claws-mail.org>
Sun, 8 Apr 2018 18:32:04 +0000 (19:32 +0100)

Trivial merge