Merge branch 'master' of orgmode.org:org-mode
commit94b9bec27c23c67398dd8e30ba6ac4c04656ed13
authorBastien Guerry <bzg@altern.org>
Wed, 11 Jul 2012 16:36:31 +0000 (11 18:36 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 11 Jul 2012 16:36:31 +0000 (11 18:36 +0200)
tree71c0dc00d25505dd86a8891f7dee3b5b9a895764
parentdadc19949144fe24b12a0a58b7fe4fbd89f3f500
parente886c548e4a057326d1ac434f39f06a6c00e260f
Merge branch 'master' of orgmode.org:org-mode