Merge branch 'maint'
commit1e62fefeeeb2f2bf3b1597607006ed96a22663ca
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 21:33:13 +0000 (21 23:33 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 21:33:13 +0000 (21 23:33 +0200)
tree80c84d3f0cf8c44081d3698ae9074940a3f21151
parentdbf2c95774dea28b04f421e907ba1c81590adda0
parenta834a5939fd7fa9b7184ebc0a4587a72916f907f
Merge branch 'maint'