Merge branch 'maint'
commitb06259357a2d94626ce1addcb6c14b506a984fb8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 20 Nov 2016 08:38:13 +0000 (20 09:38 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 20 Nov 2016 08:38:13 +0000 (20 09:38 +0100)
treec05d4c8fdfaa74fde876eafe4bb1007a54296480
parente257da172c60cfbc6ac371117ef13d0c54280c7b
parent0bdf18befde4765290d06bf11c2bf332ff5f0fe6
Merge branch 'maint'