Merge branch 'maint'
commite257da172c60cfbc6ac371117ef13d0c54280c7b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Nov 2016 22:18:38 +0000 (19 23:18 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Nov 2016 22:18:38 +0000 (19 23:18 +0100)
treeb7d73d3a394b68c821ed6d7b8e6f3e11a524569d
parentdb0377ddc68e9cd1835becefa61da4bbb2407ea4
parent1319a3be441e5b0d53c4e000d55bec7c62a9fb6c
Merge branch 'maint'