Merge branch 'maint'
commit52d4ca4b29b4e404f797130d56fec4793aed83d2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Oct 2017 21:31:45 +0000 (17 23:31 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Oct 2017 21:31:45 +0000 (17 23:31 +0200)
treeffff36536948729350c53d814f4efb6c040a157a
parent7ac8883394bc2979dee731c54ef65c0a9c135d0b
parent90d283f1894d473449a7f23fd09e3a264ed9c15d
Merge branch 'maint'
doc/org.texi
lisp/org.el