Merge branch 'maint'
commit95b76608a6ee5ff9ffba91d7cead4d7c60c767c0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 22 Oct 2017 12:40:45 +0000 (22 14:40 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 22 Oct 2017 12:40:45 +0000 (22 14:40 +0200)
tree5e74988def4c13cc21e5443700bbc2e8a8d516d1
parentbed03c4b42c66cc6fb72361a31c8df0b903eeb5a
parenta2a034f5b9088175c9fbcf034bc1094982ae739c
Merge branch 'maint'
lisp/org.el