Merge branch 'maint'
commit2525dc6c7201cde151ca09546b6f4b24907b79f3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Oct 2017 10:32:25 +0000 (14 12:32 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Oct 2017 10:32:25 +0000 (14 12:32 +0200)
tree0023ee99f8928e27e63cf7a0fca17aecad62ca98
parent7df5d21f794900676b6e33ad425c4417c3bea144
parent1d5142601ab199ce9a542df4bf4d053ac7072697
Merge branch 'maint'
lisp/org.el