Merge branch 'maint'
commit60483fbfc3a7c918a9931c77dfafb34d9443e6a2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Apr 2018 12:18:07 +0000 (26 14:18 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Apr 2018 12:18:07 +0000 (26 14:18 +0200)
tree47ab2fa5e98446bbe06d7e701e10c9487006647a
parentea6825cf1f3c2f4e43c81424ac115ef76e5698d1
parente2e5495239833034c27de6f21c496fa1b05f5d85
Merge branch 'maint'
lisp/org.el