Merge branch 'master' of orgmode.org:org-mode
commit398e8af56ed4abb0c4c6824fdcff7617097d5830
authorBastien Guerry <bzg@altern.org>
Sun, 24 Feb 2013 10:33:34 +0000 (24 11:33 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 24 Feb 2013 10:33:34 +0000 (24 11:33 +0100)
treec5ca4200b99f00d78cdf654ccdc5e33709e78f6a
parentd242be2c89d857d41285eb985a0a02f47d6d84da
parenta15a657bfb44f5b4380a8d69fc56bc4271a27f2e
Merge branch 'master' of orgmode.org:org-mode
lisp/ox-html.el