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)
commit5aae1530df967ed180f42673042c62214dd604f7
treec435d85752afb2f1f7eb2b0f2eff3bda2e643e04
parent439a5cffca5bcdefc6d4d552af64aa2e10c5ab5d
parentfd3e5155cf7652b058e677f26bf2e2ff7b1e4992
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws