Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorPaul <paul@claws-mail.org>
Wed, 9 Sep 2015 16:02:23 +0000 (17:02 +0100)
committerPaul <paul@claws-mail.org>
Wed, 9 Sep 2015 16:02:23 +0000 (17:02 +0100)

Trivial merge