Merge branch 'master' of orgmode.org:org-mode
commitd1f33de0c8e4976842688b87d565dd926f54d4dc
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 30 May 2011 22:07:04 +0000 (31 00:07 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 30 May 2011 22:07:04 +0000 (31 00:07 +0200)
treeab2dc9b37b0a8645e6bba088f2032fd474a1f5e6
parentf72541f824f26931dcd5541772a37b2c3278ae40
parent363a4554e28ddcde10e0979c5b1f020e71926bb0
Merge branch 'master' of orgmode.org:org-mode