Merge branch 'maint'
commit2a55d206e37d9dbcd77562e4acc56d1906b2aaff
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 8 Oct 2017 08:54:00 +0000 (8 10:54 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 8 Oct 2017 08:54:00 +0000 (8 10:54 +0200)
tree2a75d5a0181c3a3c421c007ffff33684f3cacd50
parentfa56da61a7d78e5c84cb1610c43745d7771d93b0
parent07f939f419163a785c5583d7f291e6ea6752584c
Merge branch 'maint'