Merge branch 'maint'
commit2a91f967ca43c940ee50a28630b7ff814b61dd34
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 31 Jan 2018 20:20:54 +0000 (31 21:20 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 31 Jan 2018 20:20:54 +0000 (31 21:20 +0100)
treee240f6d14a7aa05c68afd1dfa9543bb25711ca5b
parent86f3ef8d80bf8738fd3ba99f8d0f7ffec4e23a4e
parentddc8e8eb23b1c87f6d1bc402b898706837ea0d79
Merge branch 'maint'
lisp/ox.el