Merge branch 'maint'
commit4a878bce4aabd00bf179ae368a6162bf40db3260
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Jan 2017 15:16:24 +0000 (14 16:16 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Jan 2017 15:16:24 +0000 (14 16:16 +0100)
tree91f6346fb999b612683c902ac1c3150544f67f1f
parentd251d59a71b1482cd6a991d54b933303718edb64
parent1f76dd1fe1366cfe793ecb114d564484bd99d364
Merge branch 'maint'