Merge branch 'maint'
commitfe182cf0d74ba6920a6265f11531c69c827c245e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 24 Sep 2015 08:27:47 +0000 (24 10:27 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 24 Sep 2015 08:27:47 +0000 (24 10:27 +0200)
treed0d48efb107edc306c8ce5ec42878baf597205aa
parentd4aa7692bd7c88ba9fbe4642b443d2b699318d7e
parente68bc78ae404b1524e92986dc7ff71826c235e73
Merge branch 'maint'