Merge branch 'master' of code.orgmode.org:bzg/org-mode
commitd48bff37ad5b873ea9fbeca46cbcc9a7535688d2
authorBastien <bzg@gnu.org>
Fri, 27 Apr 2018 22:59:25 +0000 (28 00:59 +0200)
committerBastien <bzg@gnu.org>
Fri, 27 Apr 2018 22:59:25 +0000 (28 00:59 +0200)
treed31a7f2e0eab213f5f1926d63827e7936a7596cf
parentf42f15a2a1d2725cc46d8bab9c6218a5073510fd
parent9a1f2082237b9e98bdc31a7b0e15cee2c2b31312
Merge branch 'master' of code.orgmode.org:bzg/org-mode