Merge branch 'maint'
commit24219e93fb62e29e491a0990e8a299420a373003
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 10 Dec 2016 00:02:06 +0000 (10 01:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 10 Dec 2016 00:02:06 +0000 (10 01:02 +0100)
tree01cdc16a56f1acaf781bfb77ec5196c210aa0b53
parentc8da8529f5b9e063238ce79d07a17ba16ebf6ccb
parent00ea6a286c948dfefbbd6e87e6d159e5ea8d17fc
Merge branch 'maint'