Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Tue, 2 Oct 2018 14:34:17 +0000 (16:34 +0200)
committerColin Leroy <colin@colino.net>
Tue, 2 Oct 2018 14:34:17 +0000 (16:34 +0200)

Trivial merge