Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws - talons - Fork of Claws Mail https://www.claws-mail

commit 6ebafce395d07f6036b571487d26fecd792e7707
parent e92ba4b16a734387fce2bc463bd8815804e3d817
Author: Paul <paul@claws-mail.org>
Date:   Sun,  8 Apr 2018 19:32:04 +0100

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

	talons Fork of Claws Mail https://www.claws-mail
	Log \| Files \| Refs \| README \| LICENSE