Merge branch 'master' of orgmode.org:org-mode
commit896654edc2467f5d57c081abe0071e3c46a6f817
authorBastien Guerry <bzg@altern.org>
Fri, 4 Mar 2011 09:07:59 +0000 (4 10:07 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 4 Mar 2011 09:07:59 +0000 (4 10:07 +0100)
tree44e374e728fe0f562b05d967f3beeab9b78085af
parent9bb4ef66abeada1ceeca930a70c800beef24254f
parentb1f9750fd6574183c8980fa74b4ad4dcb87f0822
Merge branch 'master' of orgmode.org:org-mode