Merge branch 'master' of orgmode.org:org-mode
commitbff981d23fd3fbaa26ca8f16ea5aac6c10617d0f
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 11 Jan 2011 18:54:51 +0000 (11 19:54 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 11 Jan 2011 18:54:51 +0000 (11 19:54 +0100)
tree30a960a4d570b9868b37d8eed2ba07547411b395
parent88f8f3116c4d48d8bede1b3245c39366ff1a76d3
parent1c3ef40f2491b118965cbdbbe5bd35a00dbc8b62
Merge branch 'master' of orgmode.org:org-mode