Merge branch 'master' of git://repo.or.cz/org-mode
commitddc8e005745cb1211d3c70b15dda7cb715f61e37
authorDan Davison <davison@stats.ox.ac.uk>
Sat, 13 Mar 2010 19:21:00 +0000 (13 14:21 -0500)
committerDan Davison <davison@stats.ox.ac.uk>
Sat, 13 Mar 2010 19:21:00 +0000 (13 14:21 -0500)
treea228ff4ff85560c59326cc226bad921d6fa9de93
parent485781ed403b0cc107a3ed10cae5fbdde458183e
parent3039eff2d371202c65d0a8cafa2af762e1339e93
Merge branch 'master' of git://repo.or.cz/org-mode