Merge branch 'master' into coveralls
authorPaul Brossier <piem@piem.org>
Sun, 17 Sep 2017 13:10:32 +0000 (15:10 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 17 Sep 2017 13:10:32 +0000 (15:10 +0200)
commitb57ae47ad2d43cb3882afb4b5e59d5cf7be98db9
treeec49302153395dccc3f2631d3febe18a12f1febd
parenta729232ed7ad371b4eee13bbcd8d308b2a22a14e
parentf4fcf022b91150a1282e828b4c82895a7586a6cb
Merge branch 'master' into coveralls