Merge branch 'maint'
commite4cb4419152b9f894d78082e9e26bea2fbaad2b8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 22:28:20 +0000 (22 00:28 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 22:28:20 +0000 (22 00:28 +0200)
treeffc7ef660bdc4e458b1348abf99b09dff8b6484b
parent33ec3be7b139fc9686de29e84c57819d5ddef5ac
parente1ac95736cc41ffc93d77eeff2390ea90c34072b
Merge branch 'maint'