Merge branch 'maint'
commit591ca3a0f375163a0362825ef9d307874dda4acb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Dec 2016 08:07:44 +0000 (13 09:07 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Dec 2016 08:07:44 +0000 (13 09:07 +0100)
treeb0276f07b66af0285e1fb4bf89ee4d70a9105240
parent9fb2e047d2963ff5f4218d43bbb006898e8eac6f
parentf747ee43bd369f46c39363072f25e9842d783ece
Merge branch 'maint'