Merge branch 'maint'
commit3a53e3b10acdb3398239d15c574d69564569aa45
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 3 Jan 2017 21:12:34 +0000 (3 22:12 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 3 Jan 2017 21:12:34 +0000 (3 22:12 +0100)
treea4c3bb0aa521b2e660ccd4eba4ca174f0dfb819f
parentf1ae79ba7304b26b69f2f8f8b3855cdb0dcc987d
parent3bba31ff44033e895fedd99857363dd5b0586b41
Merge branch 'maint'