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)
commitbaca916ae21c7a7a7d382262c8669f7aea6dc226
treedadd4ffd61dbdaeded43f593d21039396d4871dd
parent5bc11591f13b40bccd9e35ee23a5255cfa44bce0
parentbfe4e5c5b3c90a95005bd091ca4c5e6265cac955
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws