From: Colin Leroy <colin@colino.net>
Date: Tue, 4 Aug 2015 10:34:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.13.0~80
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b4582cad28c37972af381447a8580a51acffaa3d

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

b4582cad28c37972af381447a8580a51acffaa3d