Merge branch 'master' of orgmode.org:org-mode
commitf73f0f6323f81b482d93db4c4f71b2841852d021
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 11 May 2011 08:10:47 +0000 (11 10:10 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 11 May 2011 08:10:47 +0000 (11 10:10 +0200)
tree136a6ff4c0739d95cf5f3028a0a9713d5816b7b5
parentaf730fec0a3349ca22a4041c3debed87e4cb392e
parent62d4dd68de8888ea21f00144c4cff9a69c06b3f9
Merge branch 'master' of orgmode.org:org-mode