Merge with orgmode.org/master
commit8391d2f84221c0928dc053638974f5b90fe0eeb0
authorJambunathan K <kjambunathan@gmail.com>
Thu, 30 Jun 2011 13:35:09 +0000 (30 19:05 +0530)
committerJambunathan K <kjambunathan@gmail.com>
Thu, 30 Jun 2011 13:35:09 +0000 (30 19:05 +0530)
treeaa3ec7492c03b89724f53d921768f06498fbe965
parent93eb7c1dff13bfe4326329538cc031eb18fe4067
parentfc313c8dfcb3dce4304a34dfccb20b74cd7d9747
Merge with orgmode.org/master
lisp/org-docbook.el
lisp/org-exp.el
lisp/org.el