Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Thu, 5 Jan 2017 17:39:21 +0000 (18:39 +0100)
committerwwp <wwp@free.fr>
Thu, 5 Jan 2017 17:39:21 +0000 (18:39 +0100)

Trivial merge