Merge branch 'master' of code.orgmode.org:bzg/org-mode
commitdf40cf42e5195b0050c8d1c663132610e980b1f0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 28 Mar 2018 15:14:31 +0000 (28 17:14 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 28 Mar 2018 15:14:31 +0000 (28 17:14 +0200)
treeeb799874ab5a8d79cad8d363272919866406715c
parente01bc94506e5a8a4e1fcdd8aff96c296d07ab436
parent052fc2226b5b4f5cc069587aa7e6101f7d3c68d2
Merge branch 'master' of code.orgmode.org:bzg/org-mode