From: wwp <wwp@free.fr>
Date: Sat, 12 Nov 2016 10:13:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.15.0~233
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=da539d8dcc781cde1cec718db4c1115a41642509

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
---

da539d8dcc781cde1cec718db4c1115a41642509