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)

Trivial merge