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)
commitd6deeaa61cf7c7891399d3b174552809b3044fb7
treebef49b137902378629e5a1bb4789026a54026c96
parentbe32eb07b7ab738613964ccbfcb21e59b3b6b77d
parentcdbf2c37c37c0207d4b14ceb8280795bc7a7f09b
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws