Merge branch 'maint'
commit13b18ea5e6886d0c79ec4d6ff50147cffad3fb08
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 1 Feb 2017 14:43:18 +0000 (1 15:43 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 1 Feb 2017 14:43:18 +0000 (1 15:43 +0100)
tree1c4e142f9e7aa7917c151904d274a8a51ba97a44
parent3134725ad8a2d339bcf5e29d1d67c2faeace3dd7
parent76c08ea77b4cb2f1dbe42b4a8003dfa457fdfdcb
Merge branch 'maint'
contrib/orgmanual.org
doc/org.texi