Merge branch 'maint'
commit7f2b2557fec0c4e19dce6ff2c571c16b6a07215c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 29 Sep 2017 20:02:10 +0000 (29 22:02 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 29 Sep 2017 20:02:10 +0000 (29 22:02 +0200)
treeed3fc61da99f2eac3c2f2879202323a2b3aa0f3e
parent3c83f1f5acdb7320a60390ecfb3b68e8564d1167
parent4fdac06ef1d569d0c806169a7c0a526cddff2d48
Merge branch 'maint'