Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Fri, 16 Dec 2016 08:16:15 +0000 (09:16 +0100)
committerwwp <wwp@free.fr>
Fri, 16 Dec 2016 08:16:15 +0000 (09:16 +0100)

Trivial merge