Merge branch 'master' of code.orgmode.org:bzg/org-mode
commit4cc10166d72a10d1d77fb797820157d43f3ddc77
authorBastien <bzg@gnu.org>
Fri, 14 Dec 2018 10:08:13 +0000 (14 11:08 +0100)
committerBastien <bzg@gnu.org>
Fri, 14 Dec 2018 10:08:13 +0000 (14 11:08 +0100)
tree17f5d54d40c6ae86337193cb588a5eef0850aeda
parent6423f391e002be59af4178be59a844dff4015216
parenta86b14253b487fc3fece992126a594a9a471f3f6
Merge branch 'master' of code.orgmode.org:bzg/org-mode