Merge branch 'maint'
commit091f10313a0c572236b7a7479e151e0ff2835d6c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 12 Dec 2016 20:02:10 +0000 (12 21:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 12 Dec 2016 20:02:10 +0000 (12 21:02 +0100)
tree8b21dad505872220dbddaf0f96f2d2052bca16e7
parent93b43e4bb486bc1b1d2e432ac74299e06a8d3526
parent5c28ea6aad2245944bb4f626fe7b039bfbb2b91b
Merge branch 'maint'