Merge branch 'master' of orgmode.org:org-mode
commit8d9f7c420894308794a430550bcac0e2400443b9
authorEric Schulte <schulte.eric@gmail.com>
Wed, 1 Jun 2011 01:09:49 +0000 (31 19:09 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Wed, 1 Jun 2011 01:09:49 +0000 (31 19:09 -0600)
tree7c0244515eb292e642e05e85cf9147b12d206004
parentfa31c082d307b1403274e557aa4a2c430cf85468
parent24221723a317a4f3dba2c53b1c426f1c7ff4c783
Merge branch 'master' of orgmode.org:org-mode