Merge branch 'maint'
commitfcda05df0d6a5cb0529b7bab87c5dbd507268515
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Sep 2017 19:12:17 +0000 (15 21:12 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Sep 2017 19:12:17 +0000 (15 21:12 +0200)
tree1297efb4e3be0db2dec21b373192c4e59feff97d
parent9c4ee81a8b3d3cbab614b1b0d5e12db284c271cf
parent9f863a695b13f5ab6c268a11c3bd7a1b4b3f8032
Merge branch 'maint'