Merge branch 'master' of orgmode.org:org-mode
commitbe25be1c8d25151de38d8c3e01a6c5be515129c1
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 25 Aug 2011 06:48:16 +0000 (25 08:48 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 25 Aug 2011 06:48:16 +0000 (25 08:48 +0200)
treebf7b0569e887eafd25e2261c716f330339ea18b2
parente91f6db1e3ddae0f0db035eaf4699e423308476f
parentd203b61a117fa3ef5f387a5c2b090bcedf2bacc0
Merge branch 'master' of orgmode.org:org-mode