Merge branch 'maint'
commit4510075ea46f7c710f307985b33a28b658a72536
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 14 Dec 2016 23:03:47 +0000 (15 00:03 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 14 Dec 2016 23:03:47 +0000 (15 00:03 +0100)
tree3dc3d342a1c68871d421a79b64742898c89760b2
parente31598bad89286cc9a6debf1cba55201adf49b27
parent7856018d7887aaafde8c82b2cda666d6beac4ff1
Merge branch 'maint'