Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Sun, 27 Mar 2016 22:00:41 +0000 (00:00 +0200)
committerColin Leroy <colin@colino.net>
Sun, 27 Mar 2016 22:00:41 +0000 (00:00 +0200)

Trivial merge