Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 24 Jan 2017 17:20:22 +0000 (18:20 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 24 Jan 2017 17:20:22 +0000 (18:20 +0100)
commit969d14deef8beb651469ef030cfcb637a73ca3ea
treeab1aa0474e3870422d749e504b8425dd7546cf70
parentc6a74d4a58bed02eaf63a3ddeadee5d33e159fb7
parent9f4c77cb6c76b75f76f64f438a1da059bb9b7244
Merge branch 'maint'
lisp/ox-html.el