Merge branch 'master' of orgmode.org:org-mode
commitc9d01a1cc98b1cfd30b2c8abd6d18809199f943d
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 26 May 2011 07:18:36 +0000 (26 09:18 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 26 May 2011 07:18:36 +0000 (26 09:18 +0200)
tree58f29dae891b265313ea64eaea26a36e9283b9a8
parent9e5ab4053edd44c012b419b83482f334409a9fc6
parentbd91803d0d1d88e94a059f28b5cccb7e969d0042
Merge branch 'master' of orgmode.org:org-mode