Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Sat, 14 Jan 2017 07:37:04 +0000 (08:37 +0100)
committerwwp <wwp@free.fr>
Sat, 14 Jan 2017 07:37:04 +0000 (08:37 +0100)

Trivial merge