Merge branch 'master' into coveralls
authorPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 15:41:35 +0000 (17:41 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 15:41:35 +0000 (17:41 +0200)
commit38a965e3372e64c68870b4fa09d14d819deb9ffc
treedd1b4af7873a87a5290844f26988065a9f76de93
parent5e56bbdb87746397a19d2ba581fb6d859046413d
parentc3e98d76d6794bdf6b683272ea857af58ef857ae
Merge branch 'master' into coveralls