Merge branch 'master' of git://repo.or.cz/org-mode
commit3f9be0bb154d521dc0feded007fcb574eff151fd
authorDan Davison <davison@stats.ox.ac.uk>
Sun, 25 Apr 2010 13:41:13 +0000 (25 09:41 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Sun, 25 Apr 2010 13:41:13 +0000 (25 09:41 -0400)
tree75c634400228b098d80202e78993d6269207a91d
parent037061e7d86ba181e51b680699f2a10ee5489c38
parentda775ffebf236aae7f3716acc341393424a0fc10
Merge branch 'master' of git://repo.or.cz/org-mode