Merge branch 'maint'
commitbe90287802f10ebed731b0fb440e9c876853b867
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 16 Apr 2017 07:00:04 +0000 (16 09:00 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 16 Apr 2017 07:00:04 +0000 (16 09:00 +0200)
tree7fb991819b1781d34d8acd8fa32edf85faf698d4
parent0be422187fbb362ba81c14964227edef56c23f21
parent842a75828f5e16412fdab5180164eda27e971e0d
Merge branch 'maint'
doc/org.texi
lisp/ox-html.el