Merge branch 'maint'
commitea98632e3b6568c096b760f7351658d110cb1930
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Apr 2016 20:52:32 +0000 (8 22:52 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Apr 2016 20:52:32 +0000 (8 22:52 +0200)
treef4d29e0477d4b97ed0e5afe8511a023d1f859196
parent519f78d1a33828136dfd0b2b9065f9fc316228ab
parentd522fc88530b0c349b612688459d4558e92ca1d2
Merge branch 'maint'