Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Fri, 13 Jan 2017 21:41:08 +0000 (22:41 +0100)
committerMichael Rasmussen <mir@datanom.net>
Fri, 13 Jan 2017 21:41:08 +0000 (22:41 +0100)

Trivial merge