Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Sun, 8 Jun 2014 15:38:53 +0000 (17:38 +0200)
committerMichael Rasmussen <mir@datanom.net>
Sun, 8 Jun 2014 15:38:53 +0000 (17:38 +0200)

Trivial merge