Merge branch 'maint'
commitc8aaf8f6947145ecae0b2bbde8ff775db73c3b8c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Sep 2017 11:21:22 +0000 (8 13:21 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Sep 2017 11:21:22 +0000 (8 13:21 +0200)
treed641a9b17a31b622fae2764b8314ee8b837201a5
parent17013d6f380bf4079d0416e006b7333195c75721
parent7ce9a24115d8cf716481adb72d5d1783e0fd047b
Merge branch 'maint'