Merge branch 'master' of orgmode.org:org-mode
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 15 Apr 2011 20:31:11 +0000 (22:31 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 15 Apr 2011 20:31:11 +0000 (22:31 +0200)
commitc2c28fc94292b4c9e2bd039add18fe721f2b4d21
tree4e06624f5f2a2c7ea301d8b8b95991597dbf6eaf
parentc56bf33812a0c7ee5ddfa8c73e598348c3bbf47a
parent1997e19bd514d81b5989cd3c0bfae87da474d460
Merge branch 'master' of orgmode.org:org-mode