Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Tue, 4 Aug 2015 10:34:37 +0000 (12:34 +0200)
committerColin Leroy <colin@colino.net>
Tue, 4 Aug 2015 10:34:37 +0000 (12:34 +0200)
commitb4582cad28c37972af381447a8580a51acffaa3d
treecc731f50a17fa66673098e1ccea3a86b33c5e776
parent9693e93d08f21661bd6ceb63e687f7ee8687300d
parent200a466aad1859b890283e959c715c279f04373c
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws