Merge branch 'master' of orgmode.org:org-mode
commitbb2dd85938599da850e760ac695adc677ece28aa
authorEric Schulte <schulte.eric@gmail.com>
Mon, 14 Mar 2011 15:31:47 +0000 (14 09:31 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Mon, 14 Mar 2011 15:31:47 +0000 (14 09:31 -0600)
treef1ef3063cc911983b373e430035772745f193ca9
parenta793b7762515897451fc02d301d0591c6c7072d1
parent6a369c26d3f936bc71cba9d7148dcecf1b2c9677
Merge branch 'master' of orgmode.org:org-mode