Merge branch 'master' of orgmode.org:org-mode
commitbeb870880a97a19b4439d92fe039fde0b9ddc5b8
authorBastien Guerry <bzg@altern.org>
Sun, 10 Jul 2011 09:05:00 +0000 (10 11:05 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 10 Jul 2011 09:05:00 +0000 (10 11:05 +0200)
tree73f5c8773326585e7ec297e46aca588192412f81
parentdaaf43e2ff4913d2d66d16d851846f67e6320550
parentecabda56038d8d6d5c4877884600045cfb32b36d
Merge branch 'master' of orgmode.org:org-mode