Merge branch 'master' of orgmode.org:org-mode
commit840052b91053c95e418059b1d064472814dfe241
authorEric Schulte <schulte.eric@gmail.com>
Thu, 10 Feb 2011 16:35:05 +0000 (10 09:35 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Thu, 10 Feb 2011 16:35:05 +0000 (10 09:35 -0700)
treebcc0d9415cc22f1d5b89e1f0f95349ecce51bc0e
parent7b720d28a6c27bf08b6e3ddbcd1c4eacb20e115d
parent39d5acd33c9a381f66e0518b84cef1af46b2e058
Merge branch 'master' of orgmode.org:org-mode