Merge branch 'maint'
commitcf00e71df5a41ac61570cd6ab2aeb9d843abbc31
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 24 Aug 2015 20:44:25 +0000 (24 22:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 24 Aug 2015 20:44:25 +0000 (24 22:44 +0200)
tree2c4493950191d19f1cfebbcd45a2fecf32c37d9b
parent1fd103293c4aafa34e599b4abb81badd89608815
parent0b524dd82c845ef64045529570926eb73b72145a
Merge branch 'maint'