Merge branch 'master-wip3'
commit71e9b321ec9b50ca1f4e6bef452d04e906ca6493
authorBastien Guerry <bzg@altern.org>
Sat, 2 Mar 2013 17:59:55 +0000 (2 18:59 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 2 Mar 2013 17:59:55 +0000 (2 18:59 +0100)
treee831da5027aebabdeaf75aab13cd3e7b24cc373b
parent0a21f829627084445edd1895c6c1f3467b72ad73
parent4351dda5ab5b1c9bafd4f1c035bbe8406ae1dd9b
Merge branch 'master-wip3'
lisp/ob-tangle.el
lisp/ox-html.el