Merge branch 'master' of orgmode.org:org-mode
commitd2fb95dd4ef60f0f6854af08a23d47afc8591084
authorBastien Guerry <bzg@altern.org>
Sun, 6 Mar 2011 15:38:19 +0000 (6 16:38 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 6 Mar 2011 15:38:19 +0000 (6 16:38 +0100)
tree06f96f7868bc82634f1945cb9494398da346b4d3
parent82224d6b34b3a4f526ea5dc22d428681f0acb5dc
parent1ecee90f472d1e92f8e932c6a46356eaada9c447
Merge branch 'master' of orgmode.org:org-mode