Merge branch 'master' of orgmode.org:org-mode
commite80305e77e039503133f8efe4aee09f5445010d2
authorEric Schulte <schulte.eric@gmail.com>
Fri, 6 May 2011 20:47:31 +0000 (6 14:47 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Fri, 6 May 2011 20:47:31 +0000 (6 14:47 -0600)
tree2c48f47796924e88bf136f3cb79367b2b8f1c524
parentec293ae62b1d92a45b752beb29b9d4163c04c573
parenteb2a890f105c8b2f96595e6f2d1fc0feab42aae2
Merge branch 'master' of orgmode.org:org-mode