Merge branch 'master' of git://repo.or.cz/org-mode
commit58e355cc179ba01ddbe1cf156379f33abdd29923
authorDan Davison <davison@stats.ox.ac.uk>
Wed, 14 Jul 2010 19:01:44 +0000 (14 15:01 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Wed, 14 Jul 2010 19:01:44 +0000 (14 15:01 -0400)
tree886cf4291195f64922bdad247d1767b9a6627bd6
parent8ddb11cfa5a744d2312f1f5796b8252f9a3c1974
parent57bfa1989d19bd4cfce32f221a8edfea4bc46557
Merge branch 'master' of git://repo.or.cz/org-mode