Merge branch 'master' of git://repo.or.cz/org-mode
commitf94c1b6c303deef66f7e5e98b61720da7480ab3c
authorDan Davison <davison@stats.ox.ac.uk>
Fri, 9 Apr 2010 12:46:06 +0000 (9 08:46 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Fri, 9 Apr 2010 12:46:06 +0000 (9 08:46 -0400)
tree3683087c7d7c7f5834d48a9fb422712873fc19b6
parentf846663ce697cfd7d5087fda699dfe581b43df7d
parent63c49bcaedfcb12d0df60ceb0dbf10a949c7f0fe
Merge branch 'master' of git://repo.or.cz/org-mode