Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Sat, 12 Nov 2016 10:13:12 +0000 (11:13 +0100)
committerwwp <wwp@free.fr>
Sat, 12 Nov 2016 10:13:12 +0000 (11:13 +0100)

Trivial merge