Merge branch 'maint'
commit892ae3c2e1808e899f5d9acfb505ebaa14068935
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 3 Feb 2018 23:13:36 +0000 (4 00:13 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 3 Feb 2018 23:13:36 +0000 (4 00:13 +0100)
tree3c9630f69c72636daaae498a8815df4106d5356d
parentd89e35ee50ccd74530f1499d99e00009dd6c57ed
parent19dcbab6f06437f6b4fc85de593c5c44e29afcc3
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el