Merge branch 'master' of git://repo.or.cz/org-mode
commit9bdf58e6ce371b913132a302f2d230e244e73b7e
authorDan Davison <davison@stats.ox.ac.uk>
Fri, 23 Apr 2010 13:04:24 +0000 (23 09:04 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Fri, 23 Apr 2010 13:04:24 +0000 (23 09:04 -0400)
treec53fe6962fa602f6589513e3126af567e667cfe7
parentd9ef2d0f3a0be1e1646bf5fe7c25278406c305e9
parent11baa7cf77245cc2a5f44dd55e034157896ad08d
Merge branch 'master' of git://repo.or.cz/org-mode