Merge branch 'master' of orgmode.org:org-mode
commit0bb05568452bdd0343ed32358f48ccd3b946983f
authorBastien Guerry <bzg@altern.org>
Fri, 14 Jan 2011 07:39:28 +0000 (14 08:39 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Jan 2011 07:39:28 +0000 (14 08:39 +0100)
treec8756f353fd0eba3ba43ee7abffc54018bbe2e21
parenta379f9c6ad32d6cfc1907493b11687ee6aee6919
parent163cd58ffd6461c98a96b1b63a3cf082b2825a52
Merge branch 'master' of orgmode.org:org-mode