Merge branch 'maint'
commit0563144e2fa3edcc0c654f3d10f77c4811aebee4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 13:41:43 +0000 (6 15:41 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 13:41:43 +0000 (6 15:41 +0200)
tree25e977d24e78c9563a9ad073499280dbd4dee99c
parentba6992888763522cb5d84e5ca3751d79ebd63fc9
parentb1d3a904f11cc32db61d0ae7323f009b31064bed
Merge branch 'maint'