Merge branch 'maint'
commite1e3cf018938e84d208b3e24a6a9bcef74b937c4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Aug 2015 20:53:27 +0000 (13 22:53 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Aug 2015 20:53:27 +0000 (13 22:53 +0200)
treefd0bdf8ea17421d9d35806027662fe0c7a44487c
parent2f2f266c243640f901e2380ab96c5054d25ea3e7
parent0500bd09e242d3580b04dd755608f706cc6eafd9
Merge branch 'maint'