Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 10 Dec 2016 00:02:06 +0000 (01:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 10 Dec 2016 00:02:06 +0000 (01:02 +0100)

Trivial merge