Merge branch 'master' of git://repo.or.cz/org-mode
commitcbe5089e0f7389995b7c9d39113fa51f1bcbc3ab
authorDan Davison <davison@stats.ox.ac.uk>
Tue, 17 Aug 2010 21:32:11 +0000 (17 17:32 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Tue, 17 Aug 2010 21:32:11 +0000 (17 17:32 -0400)
treebb361afff73c8a5a7811f5005ad01594691bbb74
parent7917e8ea29dbd91a3f0cc4d6790fd0c77abd16d0
parent7cc0612e62b8163e5ecf6a5209a6b01e78c72dee
Merge branch 'master' of git://repo.or.cz/org-mode