Merge branch 'maint'
commit7ba058963ed0076acc5084d944abe3c213eba7ef
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 4 Nov 2017 20:51:40 +0000 (4 21:51 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 4 Nov 2017 20:51:40 +0000 (4 21:51 +0100)
tree168af48bfa37ef2e0705679f79694c414fa2ec0c
parent9bee79a102fdb8887db0328f00cae1bb27c7fceb
parent6186ed3a222232fe897ad8499bca4736486b75de
Merge branch 'maint'
lisp/org-element.el
lisp/ox-texinfo.el