Merge branch 'maint'
commit3c83f1f5acdb7320a60390ecfb3b68e8564d1167
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 28 Sep 2017 21:06:37 +0000 (28 23:06 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 28 Sep 2017 21:06:37 +0000 (28 23:06 +0200)
tree872f0249e2441d3b0446bf9be783d4286594c973
parentb8d89496fda538b2110862cecbd41702110665a6
parentc1c5786c8ad8c841cb805a12439cf572c7bbd966
Merge branch 'maint'