Merge branch 'maint'
commitd251d59a71b1482cd6a991d54b933303718edb64
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Jan 2017 15:15:14 +0000 (14 16:15 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Jan 2017 15:15:14 +0000 (14 16:15 +0100)
tree10d3c1ca85f7c2a3fef6317cf9715b2807bb0fd1
parent2c5c68dec53bcdc5119614e539f72d1ef9a06765
parentbed17f1bb505dd6ecf80b44bf1ef267d45efb206
Merge branch 'maint'