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)

Trivial merge