Merge branch 'maint'
commit106ecb10a2d41ad64b244e876681f4210d798db2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 1 Apr 2017 08:17:30 +0000 (1 10:17 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 1 Apr 2017 08:17:30 +0000 (1 10:17 +0200)
treef87d3069d710653483f0d46a99d443186e9f8c6b
parente65be54b91106db20fb99baf22f36bd00c99994a
parentb2f4f4dc4274cc27995ade7872996d05cb5dc699
Merge branch 'maint'