Merge branch 'master' of orgmode.org:org-mode
commit8899e596f9b504104c2189df87d8faa63a0e9cd1
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 25 Jan 2011 21:58:37 +0000 (25 22:58 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 25 Jan 2011 21:58:37 +0000 (25 22:58 +0100)
tree1c306c6513d66d791796d99a1e6fb5e933bf0773
parent4cfea25f243b1b60fb86bd11ed07164736635ef4
parent39c982eb494cbbc73717ab5b41be6d1c7e0be183
Merge branch 'master' of orgmode.org:org-mode