Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Fri, 31 Oct 2014 10:17:29 +0000 (11:17 +0100)
committerwwp <wwp@free.fr>
Fri, 31 Oct 2014 10:17:29 +0000 (11:17 +0100)

Trivial merge