Merge branch 'master' of orgmode.org:org-mode
commita1ebd4e2071da5edf3ba728acf908c98392ea29f
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 21 Oct 2011 14:58:01 +0000 (21 16:58 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 21 Oct 2011 14:58:01 +0000 (21 16:58 +0200)
tree247b37a39d3f2d697410324252ddc88eed73c56e
parent5e67e9d8246da0bccdb8619ff1fe7b47ab6ea8ef
parentb2632dc45873f22da708ba8bcc20be5f67d3efeb
Merge branch 'master' of orgmode.org:org-mode