Merge branch 'fix-types'
commitb3a88babf1192a3a0f42d879fd78d1c753045f19
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 9 May 2013 13:24:43 +0000 (9 15:24 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 9 May 2013 13:24:43 +0000 (9 15:24 +0200)
tree513ab5d0dde6175aa84cec98022ab86253f8b7c7
parentce59889673c08353b40f7d85760ba9c878822462
parenta84c01642bf21c5d34206cd7b08644cb196e1043
Merge branch 'fix-types'
lisp/org.el
lisp/ox-html.el
lisp/ox.el