Merge branch 'maint'
commit128c132c60b06d05333811737fbf7d8d32da9ef9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 12 Aug 2015 12:53:56 +0000 (12 14:53 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 12 Aug 2015 12:53:56 +0000 (12 14:53 +0200)
treeb429a0fba0cd192b9d506d70f47753aa8fb04799
parent252029b10b2997eeaac17a423224ba52c3b85f0f
parent1e268ad334fad655f3f2748143206b54f18a1d6c
Merge branch 'maint'