Merge branch 'maint'
commit4ddfa565c949340f54503fd6faacf0ec841db6fb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Aug 2015 22:19:39 +0000 (14 00:19 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Aug 2015 22:19:39 +0000 (14 00:19 +0200)
treead1e061765b70021a2f6cde202d7999a9be0c989
parente1e3cf018938e84d208b3e24a6a9bcef74b937c4
parent719a201c3bb2e8bc35b53a372090a9e04d26f275
Merge branch 'maint'