From: Michael Rasmussen <mir@datanom.net>
Date: Fri, 9 Oct 2015 17:07:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.13.0~6
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=baca916ae21c7a7a7d382262c8669f7aea6dc226

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

baca916ae21c7a7a7d382262c8669f7aea6dc226