Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Sun, 18 Jun 2017 19:46:58 +0000 (21:46 +0200)
committerColin Leroy <colin@colino.net>
Sun, 18 Jun 2017 19:46:58 +0000 (21:46 +0200)
commit7b573007cd8be18dc7ce792cd3f03f6201592743
tree2a5bc1351efc5064e1cb40b21fb2cf89d3585375
parentf075b5064e96a9fdcc8e666c8e65f0242dabf5ff
parentd0cd54152fa784f31fa3d01e80cc4f20eb2d2d6f
Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws