Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Fri, 9 Oct 2015 17:07:14 +0000 (19:07 +0200)
committerMichael Rasmussen <mir@datanom.net>
Fri, 9 Oct 2015 17:07:14 +0000 (19:07 +0200)

Trivial merge