Merge branch 'maint'
commit9a10da6accbb29686901298ca05d07d2aa273fab
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 11 Nov 2016 09:18:36 +0000 (11 10:18 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 11 Nov 2016 09:18:36 +0000 (11 10:18 +0100)
tree61a28294078f0568a8720c1ce9c1f6c078a61f17
parent07ce47693e70d1c26a500729867d91829e3c565d
parentc93a17dd8ade3a3feb13d89b663006d04f4f2c5a
Merge branch 'maint'