Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorPaul <paul@claws-mail.org>
Wed, 9 Sep 2015 16:02:23 +0000 (17:02 +0100)
committerPaul <paul@claws-mail.org>
Wed, 9 Sep 2015 16:02:23 +0000 (17:02 +0100)
commit6d746bea45f768fcaba27ca9a066105d528ea2db
treed5466624f072ff8f416e2870ac282e961a83821f
parent952429350434024b69f925a82a7daeeefe2175bd
parent0617341d22124f8eea9bc0620773f580768c5610
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws