Merge branch 'master' of code.orgmode.org:bzg/org-mode
commitf89189c6188c93b57f2efdc52f294586b99c624b
authorBastien <bzg@gnu.org>
Sat, 15 Dec 2018 16:16:47 +0000 (15 17:16 +0100)
committerBastien <bzg@gnu.org>
Sat, 15 Dec 2018 16:16:47 +0000 (15 17:16 +0100)
tree1455428fcab61954706581b749a98be8cf3bc335
parent4cc10166d72a10d1d77fb797820157d43f3ddc77
parentdc7477070616d01f4da2b60692e72de85bfcc7b4
Merge branch 'master' of code.orgmode.org:bzg/org-mode