Merge branch 'maint'
commitb0251b747a005c2778c162e863625dd87b21f42b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 13 Feb 2017 15:35:32 +0000 (13 16:35 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 13 Feb 2017 15:35:32 +0000 (13 16:35 +0100)
tree8340425a7adaa6b92fb345fbb0b12faa5c790dda
parent42e08d96e8807b2ff14b1d193d872e643fabec92
parentd347d85a15750641552b15436b7e86bb0b9d1fa8
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-ox.el