Merge branch 'maint'
commitfb58727f3263bc1eabb3cc077d0e7efb4241ad11
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 8 Apr 2018 16:39:36 +0000 (8 18:39 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 8 Apr 2018 16:39:36 +0000 (8 18:39 +0200)
tree9613419dfb66427a5633de471dde490a0a6e7640
parent39837b4b31413831c89ab98ae7ac5d52e21dd681
parentf05c2eae3394afa5d8075ccac38b94163acda9e7
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el