Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Thu, 20 Aug 2015 18:23:14 +0000 (20:23 +0200)
committerMichael Rasmussen <mir@datanom.net>
Thu, 20 Aug 2015 18:23:14 +0000 (20:23 +0200)
commitf8f7de3c140f13c92510694e5635b2ebf7ad18a9
treea151c7ed00836a99ef2e69b11dd39c68f33c2f6f
parentfefb4204bf74f23a6a5a98b43ea54fb4a49e4792
parent8f4236e282d3252ecf9f3920e2e5c312d2cf50fc
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws