Merge branch 'maint'
commitc82c21c7acca7a77bc3afcb865864469935f55f0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 8 Jan 2018 19:40:16 +0000 (8 20:40 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 8 Jan 2018 19:40:16 +0000 (8 20:40 +0100)
treeba00dfa870f6569319b4faa40edd51a338fd8242
parent9096ea4f3babcf614beffdd46f9f615b0b128727
parented2bcab0ea7a5cc4e7cf78413473d2ca08cd1f93
Merge branch 'maint'
lisp/ox.el