Merge branch 'maint'
commit147cada50636e1c3bbe75bdf69154e7985dda804
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Nov 2016 23:48:30 +0000 (11 00:48 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Nov 2016 23:48:30 +0000 (11 00:48 +0100)
tree0138944b7b247ff685d93914953a1f990579a2e8
parentc535f54330ed9d80f1fa92b398682b41016eb158
parentc6f9aeb06ea9a5ae4d19218a514e28b294d5cbf6
Merge branch 'maint'