Merge branch 'maint'
commit62112f5a86f50e2f4f7e5c8a9f28a04dc8504456
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 3 Dec 2017 16:37:48 +0000 (3 17:37 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 3 Dec 2017 16:37:48 +0000 (3 17:37 +0100)
treeddd9bca043089e2f2321f6ceb056db521f3bcb3c
parentff36e945ca9e8f67e3a0ac8e0d7a78384719c18a
parentc2c301c9cc4352d4a666d6177e160207bae4c378
Merge branch 'maint'
doc/org.texi