Merge branch 'maint'
commit2390b6302d27961a2f83b949fa73b93b41c7c486
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Dec 2017 22:21:07 +0000 (11 23:21 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Dec 2017 22:21:07 +0000 (11 23:21 +0100)
tree72470c0bd6565e4101f4ce0eb6652bd0c32421f1
parente8b71b86d21fa384873ef69e9f7495d17d084124
parent0dde39ccd35414da7c210ac97633a21f63e903fe
Merge branch 'maint'
lisp/org-archive.el