Merge branch 'maint'
commita3073a06f42d7097ff00c8f54b059fd6e0f92d3f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 29 Dec 2016 00:20:27 +0000 (29 01:20 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 29 Dec 2016 00:20:27 +0000 (29 01:20 +0100)
tree0f02562141d2722ac3d5d45bce6235dbb22eff37
parentc47d6892fa7aa862bac569b21d70e1d443e7b2c2
parent57ca9ba80a8527e2ecbcf17c057d9eea52edf2e3
Merge branch 'maint'