Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Dec 2017 12:45:43 +0000 (13:45 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Dec 2017 12:45:43 +0000 (13:45 +0100)
commit6ffcdcbf021a29eca2ac6268c8cca0050cff96f6
tree4a80bb31e2cff5ba1a5fde56f2ba5fbec5046a4b
parent1992394148c41acee905e3191e3c32ee40333096
parent84cb63a44aaee9b97884903f4576b761a837724f
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el