Merge branch 'maint'
commite9b3c3ec578de48f85bf3316379b6d35d618d8ab
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 11 Nov 2016 16:49:39 +0000 (11 17:49 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 11 Nov 2016 16:49:39 +0000 (11 17:49 +0100)
tree692767ae56bcfffc7aaa63bc4d2e63b1ed8ac644
parentb28377998d79b0baeacdff41b1de549e58cf85b6
parent27b10fb2651ea46bf5f6be3dbbc3cc17a42b9536
Merge branch 'maint'