Merge branch 'master' of orgmode.org:org-mode
commitd09463331438a439e39f69343e6d4c71f3a54710
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 17 Jun 2011 07:55:24 +0000 (17 09:55 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 17 Jun 2011 07:55:24 +0000 (17 09:55 +0200)
tree14a571503372083b8e5a49f0432bba7688f98ea1
parented02a6f8d17f7fcba046f9cfbb593c42731d2045
parentdb1c3f6a3ea5d9cb25c8fad5aae434fc1d424152
Merge branch 'master' of orgmode.org:org-mode