Merge branch 'maint'
commitf1ae79ba7304b26b69f2f8f8b3855cdb0dcc987d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 3 Jan 2017 17:29:22 +0000 (3 18:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 3 Jan 2017 17:29:22 +0000 (3 18:29 +0100)
tree41aeafd64588720ea7f10925f60a7107e03e725b
parentd0d05e5df122b27148545f2d7c92e2c8345b9c83
parent93f90c8412d61930aa367d8ca61e10ff44f4090a
Merge branch 'maint'