Merge branch 'maint'
commit473ca5c86c4a1f3889ef868988b7b110da250e00
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 17 Feb 2017 07:37:55 +0000 (17 08:37 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 17 Feb 2017 07:37:55 +0000 (17 08:37 +0100)
tree7bae148c907bdbc9a074ca2a49de0a6f9985fbd4
parent4caad0555fcfd34c9357d146ec3d3bbf547b01e3
parentb5a67ebddd0afe24126fedcd10017d92502c6f10
Merge branch 'maint'
lisp/org-element.el
lisp/ox.el
testing/lisp/test-ox.el