Merge branch 'maint'
commitea3de7286e2bb8f43ce8fa2021ebbaaf88bffee5
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 12 Nov 2016 00:09:31 +0000 (12 01:09 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 12 Nov 2016 00:09:31 +0000 (12 01:09 +0100)
tree7acfabc1c6580afe4792ab1c0f5497bc6201c817
parente9b3c3ec578de48f85bf3316379b6d35d618d8ab
parent31a112d4dd37bf0c85529475b4d077531fd35e5a
Merge branch 'maint'