Merge branch 'maint'
commit252029b10b2997eeaac17a423224ba52c3b85f0f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 23:13:38 +0000 (12 01:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 23:13:38 +0000 (12 01:13 +0200)
treed5f6a47c7e3fdd215a3aefe40ce8d1f6d1474f74
parent36468b90dbbff033b740d641c42c4aa5e7efc14c
parent0359f7550a1702538b676e681df093fdd11c3eb6
Merge branch 'maint'