Merge branch 'master' of orgmode.org:org-mode
commit6ebd09177ee005b0028faf0db9bc4c12a7f1103e
authorBastien Guerry <bzg@altern.org>
Fri, 14 Jan 2011 19:08:47 +0000 (14 20:08 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Jan 2011 19:08:47 +0000 (14 20:08 +0100)
treee662eeac1872662bc42c1040438d0a5ee4fcab1f
parent0bb05568452bdd0343ed32358f48ccd3b946983f
parent079c4a026d74d7666ea6df80f0febb37547b90a5
Merge branch 'master' of orgmode.org:org-mode