Merge branch 'maint'
commitf50c44897a0614c87a05af1a7747c550df736e9c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Nov 2016 17:02:11 +0000 (25 18:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Nov 2016 17:02:11 +0000 (25 18:02 +0100)
tree103d7b331f15ba27c40c3fd1a069bd70cc870f0e
parent8bf0d32aed1c7fe86b1d1f4578da872ee9b5f628
parentb77ef877ab6b9f86a0691917641770fb9b700ff3
Merge branch 'maint'