Merge branch 'master' of orgmode.org:org-mode
commitaf677f6d0667bacba72defeaee7e76557e68f8c8
authorEric Schulte <schulte.eric@gmail.com>
Wed, 1 Jun 2011 12:46:50 +0000 (1 06:46 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Wed, 1 Jun 2011 12:46:50 +0000 (1 06:46 -0600)
treeea8e42ab28125540711d4dec3c5931bc7823dbb3
parent459cbd4fd86fcca8478de12ed0c067e032e4760c
parent32ac8dd0e51a73a8b7190c0fb10074e56e9f7aca
Merge branch 'master' of orgmode.org:org-mode