Merge branch 'master' of code.orgmode.org:bzg/org-mode
commit32b16bceb6c0ecfe88eaaa7f67ebec7a6245e060
authorBastien <bzg@gnu.org>
Tue, 27 Nov 2018 08:22:31 +0000 (27 09:22 +0100)
committerBastien <bzg@gnu.org>
Tue, 27 Nov 2018 08:22:31 +0000 (27 09:22 +0100)
tree37f4caadcc14395701e3755274e2be3e721c071b
parentc24fa93c791e1e6e38a0158b66be25126386cf47
parentcd60a35fe1088ac9d42e324968df04d36b7f0668
Merge branch 'master' of code.orgmode.org:bzg/org-mode