Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit68b810dab55bbd6b91d253337f73400f93b0c92e
authorDan Davison <davison@stats.ox.ac.uk>
Thu, 21 Oct 2010 12:03:09 +0000 (21 13:03 +0100)
committerDan Davison <davison@stats.ox.ac.uk>
Thu, 21 Oct 2010 12:03:09 +0000 (21 13:03 +0100)
tree6a8dc447c6cd24f8ac3941cf0b73f05c48a9ea3a
parentba9236054a7e348f35332f404e9df93091a2ebb7
parente290e9e2f4716acbe6ef011f3e5574c6c926aa8b
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
lisp/ob.el