Merge branch 'master' of orgmode.org:org-mode
commit97ae0949602a0f71ead0e8a77e3d19d0486d9339
authorBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 07:24:41 +0000 (9 09:24 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 9 Apr 2011 07:24:41 +0000 (9 09:24 +0200)
treee9d03b3c6cd0dd286c1fadf17247e26f239173ec
parentc717044a7c73041074771ecd5bbd40948160ad12
parent9fc5577646621fb6bb41e3cc208a8e5919c57919
Merge branch 'master' of orgmode.org:org-mode
doc/org.texi