Merge branch 'maint'
commit0ace32b045cb70c7889eece0cb351217b7fd652a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Dec 2017 11:23:02 +0000 (2 12:23 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Dec 2017 11:23:02 +0000 (2 12:23 +0100)
treec9273a829e01b386f32477e1ef46b77a91c42973
parent7a3cae65a705f0559d890c6e11f8317ba8dbe42d
parentf53d1e2005a26a52427b7514f2d3e7cfa3ff2562
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el