Merge branch 'master' of orgmode.org:org-mode
commit30f7c5cc0d2079b03227abfde58539fc6246c149
authorBastien Guerry <bzg@altern.org>
Fri, 28 Oct 2011 13:17:06 +0000 (28 15:17 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Oct 2011 13:17:06 +0000 (28 15:17 +0200)
treef78aa8613bfb31fd609522071ca24cdc8ede3aae
parent735bf5cd05c970d08aaecf800973f59a39dea7fb
parent87fc97d1311bab9a7cecf650f014bfb4172fbf1e
Merge branch 'master' of orgmode.org:org-mode