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)
commitda539d8dcc781cde1cec718db4c1115a41642509
treed0cfba9a9d7e66262bf2fd4b74143da8af18b45f
parentea3b84c0503aced0efba12f33a15cb06a4458304
parent75fcc188b633803a6279e278a14a5be1e237c9d3
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws