Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Thu, 20 Aug 2015 18:23:14 +0000 (20:23 +0200)
committerMichael Rasmussen <mir@datanom.net>
Thu, 20 Aug 2015 18:23:14 +0000 (20:23 +0200)

Trivial merge