Merge branch 'master' of orgmode.org:org-mode
commit48218e4b314060bf8e8ebe6c5deb0a6a36f21fce
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 15 Jan 2011 11:58:54 +0000 (15 12:58 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 15 Jan 2011 11:58:54 +0000 (15 12:58 +0100)
treeac69a61dea5a1f1a87c0557af0c153647af5796a
parentc747c7f7fb84c9aa2a56d83e7be396ebff8f0082
parent971b9eeacd38959439ddaa7c650430cc2dcb673e
Merge branch 'master' of orgmode.org:org-mode