Merge branch 'maint'
commit52a5375861cf601eac4c1c409c751a4b50df6b24
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 28 Jun 2017 12:47:35 +0000 (28 14:47 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 28 Jun 2017 12:47:35 +0000 (28 14:47 +0200)
tree79fc9884c683f14f91612fb0ea2ec017893ac721
parent82ff5277ff4028c85b5ccdb0afe71eddded888e9
parent1385dea0b94e7762e214afb301704c7c56145e3e
Merge branch 'maint'