Merge branch 'maint'
commit4c703513a7a2de7593a7d8611d02a7d1d900dce0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 12 Nov 2017 21:38:26 +0000 (12 22:38 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 12 Nov 2017 21:38:26 +0000 (12 22:38 +0100)
tree56d3381e36777acde4054f9e229e3b0f0d5073d1
parent44189a72d5326a44388daf9f7fa64abb31b5286a
parentfcf4bb61ecd6f0471a0a334fdc2178cd9131c964
Merge branch 'maint'
lisp/ox.el