Merge branch 'maint'
commit38de30ad8ee91600eda48f5caaf19cbb05b37b14
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 12:39:09 +0000 (12 14:39 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 12:39:09 +0000 (12 14:39 +0200)
tree038844aae452de7096266d5d064ca04f93bf1145
parent824e95540d34cf9f8d00f4ac81c592e66ae2b345
parenta8d0e76b7d331ad90aba413bc73f736b37b3d1da
Merge branch 'maint'
lisp/ox-html.el