Merge branch 'master' of git://repo.or.cz/org-mode
commit7917e8ea29dbd91a3f0cc4d6790fd0c77abd16d0
authorDan Davison <davison@stats.ox.ac.uk>
Tue, 17 Aug 2010 15:29:21 +0000 (17 11:29 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Tue, 17 Aug 2010 15:29:21 +0000 (17 11:29 -0400)
tree1488852cbb392a53b87edb0e0c7995b271b88238
parent4f82a58e8c29cb54c3ead1e0e83311de685a830a
parent8e1287c389f2aedec220de72c9d79d4d8baab8b1
Merge branch 'master' of git://repo.or.cz/org-mode