Merge branch 'maint'
commit2498f996ead002ea67701cbfe7ae12322e87bbec
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 14:49:14 +0000 (14 16:49 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 14:49:14 +0000 (14 16:49 +0200)
tree44f9beb6c48c015c32236d450e9c1a9b6116105a
parent67fe03bcd788a2f5206cd094d5e03a112499b726
parent6539b0d3f95dcd7bc8531b402e5f75e5d5cb3c32
Merge branch 'maint'