Merge branch 'maint'
commit305ff7d74aae186040a41bcef2e59446350c438e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Nov 2016 20:56:42 +0000 (30 21:56 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Nov 2016 20:56:42 +0000 (30 21:56 +0100)
tree73e7c63cdec9a296a84be5d1c15a1c15e52a0759
parent3271cbab6575176e9663c0ddc77ee98bf53d9fb9
parente336f39ce7cb101d1fe735e2e35fb76d93bfe173
Merge branch 'maint'