Merge branch 'maint'
commitbed03c4b42c66cc6fb72361a31c8df0b903eeb5a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 22 Oct 2017 10:42:35 +0000 (22 12:42 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 22 Oct 2017 10:42:35 +0000 (22 12:42 +0200)
tree492d85cc76e2859b2d59544b6cafdcce7566f134
parent33ca07b5df2a67f3e2bb4fdb3858cd009d19a646
parent1613153aac84a183a9b91f7fde788f6552bc2954
Merge branch 'maint'