Merge branch 'master' of code.orgmode.org:bzg/org-mode
commit99b6a481ca64c1ec847bf52e4cb1cd051a778273
authorBastien <bzg@gnu.org>
Mon, 15 Oct 2018 20:49:46 +0000 (15 22:49 +0200)
committerBastien <bzg@gnu.org>
Mon, 15 Oct 2018 20:49:46 +0000 (15 22:49 +0200)
treefbe7bd1ed71c200c14463b64a9fc3318f2651fda
parent83f97cbd875ec335f2f97ec89b9dd63080f08df0
parent823d9048e78dd51af6bb68e6ed51524a58b2a73a
Merge branch 'master' of code.orgmode.org:bzg/org-mode