Merge branch 'maint'
commitf22c23277ff6bebe0ff1060243c206e8e6dcecad
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 7 Sep 2017 16:03:03 +0000 (7 18:03 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 7 Sep 2017 16:03:03 +0000 (7 18:03 +0200)
tree752c2ef8486c4d986ccfd1d620928b1969ca8a0f
parent9c5d03ca3b751d430f32c16ed92ce4fa7564312e
parentb16086d9af92e8b1865f53d984e675ef2c5b3db9
Merge branch 'maint'