Merge branch 'master' into sampler
authorPaul Brossier <piem@piem.org>
Tue, 14 Mar 2017 02:42:40 +0000 (03:42 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 14 Mar 2017 02:42:40 +0000 (03:42 +0100)
commit9d564b1b3b2781c0b64db679b1fda1361fd2cf37
tree17f936843c257fb2b0e711d95715573b91eecab1
parentde7285af32dd4e393d6759e0cfb52b7c37193b35
parentec5fc10955c2d8e51b93b894d1038ee16f7113c8
Merge branch 'master' into sampler