Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Mon, 28 Apr 2014 08:27:44 +0000 (10:27 +0200)
committerwwp <wwp@free.fr>
Mon, 28 Apr 2014 08:27:44 +0000 (10:27 +0200)

Trivial merge