Merge branch 'maint'
commit93fc10a141c62929b5ddde706f0f2d991e15d919
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 12:46:55 +0000 (21 14:46 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 12:46:55 +0000 (21 14:46 +0200)
treeb1c40f91cd25db8d24fcc33d312d1ebc184103f4
parenta8a60cc7f79b7dbadad0dc5cd2362017e45973dc
parent56cd178caebd061c992d4c7c682d0e4dc2c40f26
Merge branch 'maint'