Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Fri, 30 May 2014 12:37:10 +0000 (14:37 +0200)
committerColin Leroy <colin@colino.net>
Fri, 30 May 2014 12:37:10 +0000 (14:37 +0200)

Trivial merge