From: Michael Rasmussen <mir@datanom.net>
Date: Fri, 9 Feb 2018 19:40:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.17.0~213
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d1c488269e3244759b921c041c77bcd198282af0

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

d1c488269e3244759b921c041c77bcd198282af0