Merge branch 'master' of git://repo.or.cz/org-mode
commit381f913af38297bec678fce5c2ce7957caa6a3f0
authorDan Davison <davison@stats.ox.ac.uk>
Tue, 31 Aug 2010 07:11:41 +0000 (31 00:11 -0700)
committerDan Davison <davison@stats.ox.ac.uk>
Tue, 31 Aug 2010 07:11:41 +0000 (31 00:11 -0700)
treeb4a8261eaff3a5dfc79b8f317ed410d4c974c042
parent8cb53ddc1a2960c4e5eccc3c9be605ea7f492e4b
parentdabfd646aec0c4a5ebcacb52e62e5b3130544e0b
Merge branch 'master' of git://repo.or.cz/org-mode