Merge branch 'master' of code.orgmode.org:bzg/org-mode
commit28866449d90ae29465438b3e563ae028fec6c2a1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 27 Apr 2018 13:12:19 +0000 (27 15:12 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 27 Apr 2018 13:12:19 +0000 (27 15:12 +0200)
tree4c155899bdcad18a737056077e3de3fac06ef3de
parent5d8b85e28055a80c624a9d573902f7396c5d136f
parentb08245a74e2da97ef4ff47e3fc26a6d2ab50d2f6
Merge branch 'master' of code.orgmode.org:bzg/org-mode