Merge branch 'maint'
commit7a726dd1371b19efc9cc7dfbab763691194257d5
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 22 Nov 2013 08:49:17 +0000 (22 09:49 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 22 Nov 2013 08:49:17 +0000 (22 09:49 +0100)
tree7c3b9a014500fb6c902cce346db7a3308d3001a5
parent336430f6e862efe99bca2efd747bb105f031b546
parent23e6c72133b690711ab0247ae5b15ada4ad2a7e8
Merge branch 'maint'
lisp/ox-html.el