Merge branch 'maint'
commita43eaccfce3b25999d91349f2c00b209970693ab
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 21 Nov 2016 22:25:51 +0000 (21 23:25 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 21 Nov 2016 22:25:51 +0000 (21 23:25 +0100)
tree1d3079d154ec9e34046857f29d1d04c925fc86e9
parentb06259357a2d94626ce1addcb6c14b506a984fb8
parent0dd024aa92a282ce28cd15ebd091b2f2b211a948
Merge branch 'maint'