Merge branch 'maint'
commit00ba78c78d8383a46880662c052aa00537192a38
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 16:01:04 +0000 (6 18:01 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 16:01:04 +0000 (6 18:01 +0200)
tree07e775803780c57b9ed453d8992927f5e77283da
parent0563144e2fa3edcc0c654f3d10f77c4811aebee4
parent570b1935e7db9913a2eb9084b6f1adc0d07a36cc
Merge branch 'maint'