Merge branch 'maint'
commite77daf83912b6257626be0ab86ce027f1974d095
authorBastien Guerry <bzg@altern.org>
Fri, 9 Mar 2012 01:55:03 +0000 (9 02:55 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 9 Mar 2012 01:55:03 +0000 (9 02:55 +0100)
tree212fe92e34bd07c89e149c5aba2a907099bb2457
parentf8efc632364a04e70870027852f533e42c3d1137
parent1b4480e15fd6ee936c2edf87d955f68a1ffe6cab
Merge branch 'maint'
lisp/org-html.el