Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Tue, 13 Dec 2016 07:57:52 +0000 (08:57 +0100)
committerwwp <wwp@free.fr>
Tue, 13 Dec 2016 07:57:52 +0000 (08:57 +0100)

Trivial merge