Merge branch 'maint'
commit579fa12f50ca2381a584acf0a7da988887143719
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 26 Nov 2017 10:02:14 +0000 (26 11:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 26 Nov 2017 10:02:14 +0000 (26 11:02 +0100)
treeef441d8775784eaede0cd4096d1be46e7dd51c12
parentb186d1d7236c0dc397eadeb004c9a17eaffd3aab
parentac4b756588b0809e3a2e13706cac6fa7279c230d
Merge branch 'maint'
lisp/org.el
lisp/ox-html.el