Merge branch 'maint'
commit566794e98e27830b254256d9113cfa0dec30a3f2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 19 Jun 2017 10:35:51 +0000 (19 12:35 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 19 Jun 2017 10:35:51 +0000 (19 12:35 +0200)
tree7729f5cfbacc00ae5d8f43f21979ae47f8cfc516
parenta615d399d9b51cbdafc146d3f526da418a27fe00
parent002e2a072cc58041588d06a4812e61577b2d34d5
Merge branch 'maint'