Merge branch 'master' of orgmode.org:org-mode
commit34fa86edf5fff3c52337de9bdb1769ec53a74b32
authorPaul Sexton <psexton@xnet.co.nz>
Tue, 24 May 2011 23:46:09 +0000 (25 11:46 +1200)
committerPaul Sexton <psexton@xnet.co.nz>
Tue, 24 May 2011 23:46:09 +0000 (25 11:46 +1200)
tree9e4f7d3ac1b9e502549bc7574ed39e13fef1d9ff
parent9938a6aa93a3aeedf0d84f184f30d75eb8c87ec1
parentb6384bbcbe49c662c6aee56c30b20ebf23a9e65c
Merge branch 'master' of orgmode.org:org-mode