Merge branch 'maint'
commitb769b57ec43f9f3a0bc59c748a0c7c62ab23d8ca
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Nov 2016 01:08:46 +0000 (25 02:08 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Nov 2016 01:08:46 +0000 (25 02:08 +0100)
treedb526ef18e8629f466f31e744ff13ad8fc4d26b1
parentd82811a4f9db6d2bbb9f25559e854ee3c18fda2a
parent26828778c6a72c9331415897d557914aaf97ba0c
Merge branch 'maint'