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

commit 650e162f0f6995a1cd6782fcf2ce9fa65410701a
parent 8ab8e461d5669405dcc9a38521e5b29d34ba4675
Author: Michael Rasmussen <mir@datanom.net>
Date:   Fri, 13 Jan 2017 22:41:08 +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