Merge branch 'maint'
commit039004ddee7cd7163dccf4b7af6e562ae6e32311
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 21 Sep 2017 19:17:04 +0000 (21 21:17 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 21 Sep 2017 19:17:04 +0000 (21 21:17 +0200)
tree335e8bfca927ad12a3c0d65fb37bc2843e1e5764
parentad0662bbe7cff0e9270bd58067a87fb1d4b1c1d8
parent196ed7feffdb3da402924bfd8a71729b816cd804
Merge branch 'maint'
doc/org.texi