Merge branch 'maint'
commit7eeb396c7d3bbe07721ba67871deca7c3ae8f471
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 20 Apr 2018 09:13:17 +0000 (20 11:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 20 Apr 2018 09:13:17 +0000 (20 11:13 +0200)
tree231e85182a17e8c140d0510006773ceef5236edc
parent95af956cfd6f6dd3028d561671f2fa4782465aa2
parent14d3d59c44c63e82048e3d6424119f0fe8a64999
Merge branch 'maint'
doc/org.texi