Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 23 Jun 2017 11:53:08 +0000 (13:53 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 23 Jun 2017 11:53:08 +0000 (13:53 +0200)
commitcc631078ad0ad5def8b726d98c49927232edc5b7
tree5c528d7ee09e865d9d3c4a6f2a22b71d5e6c2b6b
parentd94475d63c15cc445d6357a6ca531de6c9e8be34
parent7ca34d2aef42aad1d48692b58f51514e61204fd6
Merge branch 'maint'