Merge branch 'maint'
commit93b43e4bb486bc1b1d2e432ac74299e06a8d3526
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 11 Dec 2016 00:37:45 +0000 (11 01:37 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 11 Dec 2016 00:37:45 +0000 (11 01:37 +0100)
tree95874926b447bc67859a39138cbd02065b52560a
parent6c8c51c8a1468b9fee239a75b6f345002fead29e
parentd777418ac68611038cbf219a3a94594400c46d7c
Merge branch 'maint'