Merge branch 'master' into coveralls
authorPaul Brossier <piem@piem.org>
Sun, 17 Sep 2017 19:22:32 +0000 (21:22 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 17 Sep 2017 19:22:32 +0000 (21:22 +0200)
commitdfa4095daba45357b53d619f55dd3b90085ef792
tree570fc7647d9e98d12e010de04bbaa92e258a4078
parentbdc980bc887ca4363c7614465bae52534e8dd027
parent5eaed62bb6f6431a9972e0461c0e83d98ab55348
Merge branch 'master' into coveralls