Merge branch 'maint'
commit3a54827bdfb6e4fdedf9fb7f348f156a9ceddb04
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 1 Jan 2017 23:14:18 +0000 (2 00:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 1 Jan 2017 23:14:18 +0000 (2 00:14 +0100)
tree9d74a3bc54c7384829b1a6b690d50afbc5c01d19
parentff31dc2ab5d6c09fd3489bede3c13d5be7309537
parentd90ca0d7c91cece1a907c392edbad385928613f5
Merge branch 'maint'