From: wwp <wwp@free.fr>
Date: Tue, 13 Dec 2016 07:57:52 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.15.0~192
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a34523c61866032b23efd90390990c5e114db1df

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

a34523c61866032b23efd90390990c5e114db1df