Merge branch 'master' of orgmode.org:org-mode
commitfe0641a0fbef7b70834cbfefc61b42f188098d6d
authorBastien Guerry <bzg@altern.org>
Sun, 6 May 2012 07:17:53 +0000 (6 09:17 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 6 May 2012 07:17:53 +0000 (6 09:17 +0200)
treeab2cd1d76c1fc7bacbdf03f6afb211fdf0d15b93
parente70068feedc7dfec15d055eb22dd29c75b76b1a2
parente8d291bc76370a1af0cdc289523bf1f5500b4e97
Merge branch 'master' of orgmode.org:org-mode