Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Fri, 14 Nov 2014 23:41:21 +0000 (00:41 +0100)
committerMichael Rasmussen <mir@datanom.net>
Fri, 14 Nov 2014 23:41:21 +0000 (00:41 +0100)

Trivial merge