Merge branch 'master' of orgmode.org:org-mode
commit9108d3f0ee1db9cb2f547046d23a9fb12d681fc0
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 14 Jun 2011 12:56:07 +0000 (14 14:56 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 14 Jun 2011 12:56:07 +0000 (14 14:56 +0200)
treea48a536bcb517906ce97c039f6d846a0599b7f1c
parent1891ee5aafee710315a26595385e670e1ac3771e
parent90f6765cdf77c1414726d899f00c77da43f45758
Merge branch 'master' of orgmode.org:org-mode