Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Sun, 27 Apr 2014 20:05:35 +0000 (22:05 +0200)
committerColin Leroy <colin@colino.net>
Sun, 27 Apr 2014 20:05:35 +0000 (22:05 +0200)

Trivial merge