Merge branch 'master' of orgmode.org:org-mode
commitbfdc9420503ded8d3dc05bff16f1af9f22f832aa
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 28 Apr 2011 20:58:42 +0000 (28 22:58 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 28 Apr 2011 20:58:42 +0000 (28 22:58 +0200)
treee9fd29d3d51675782a2bfceaa8892ca38996adb3
parent69811ff44cb4350278fab9a683f14393e3cc22c9
parent4a8640d0cfe631abc68b03f33cb537a49d928c4c
Merge branch 'master' of orgmode.org:org-mode