Merge branch 'master' of orgmode.org:org-mode
commitbd91803d0d1d88e94a059f28b5cccb7e969d0042
authorPaul Sexton <psexton@xnet.co.nz>
Wed, 25 May 2011 08:04:12 +0000 (25 20:04 +1200)
committerPaul Sexton <psexton@xnet.co.nz>
Wed, 25 May 2011 08:04:12 +0000 (25 20:04 +1200)
tree898ca0372fa9e27342bc2bf6ef4f90995157f399
parent69ba863ca0668caa38133280dbf7e6f959b8618d
parent33bae13aeba921218b614a5a0c0b12bf7d911c4f
Merge branch 'master' of orgmode.org:org-mode