Merge branch 'maint'
commit181df8493e97bbe3123ef700dc0a1f9b009f3f24
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Aug 2015 08:05:30 +0000 (10 10:05 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Aug 2015 08:05:30 +0000 (10 10:05 +0200)
treedd206165b0a4cf806f70a9211fb44fc9e52e6e20
parenta427dd0f3bae34015f88cf4c1a3741f9f8ef3b99
parent7204ba0e4616714d22f04af62ee8e375275f1353
Merge branch 'maint'