Merge branch 'maint'
commit872666f738c9e65f6f57f5ef1ec9a898b88a28b4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 7 Dec 2016 22:14:50 +0000 (7 23:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 7 Dec 2016 22:14:50 +0000 (7 23:14 +0100)
tree97626a48220ec3a939c78cbd397e91c2b264f911
parent47ca6c129c4c7557eb8ae4cd3c656fb8b3c4b0b6
parent3c64f0661727485d6ee3bfa1aae956b441fa8312
Merge branch 'maint'
lisp/ox.el