Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Tue, 11 Aug 2015 12:45:08 +0000 (14:45 +0200)
committerColin Leroy <colin@colino.net>
Tue, 11 Aug 2015 12:45:08 +0000 (14:45 +0200)
commitc1172c548a18b4161b965b57371239ca38e2c565
treee973673ac9ba5e03fa17612b2234831c79e5d693
parentf04aaa4cb1ed092b76bf60190a3d8f8cdcafed9e
parent229e17d5b79d25bb0657c6b985af15ca15058356
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws