From: Michael Rasmussen <mir@datanom.net>
Date: Tue, 29 Aug 2017 21:07:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.17.0~218
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c03433163c1b3d0d9aaefc82c7c5a5fa2c413a58

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

c03433163c1b3d0d9aaefc82c7c5a5fa2c413a58