Merge branch 'maint'
commit6834142d8763d16b3d2722c698e55c6f4693625f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 29 Apr 2017 12:34:09 +0000 (29 14:34 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 29 Apr 2017 12:34:09 +0000 (29 14:34 +0200)
tree1cb03e27ed849136dae3eb7dee834294ba45d33b
parent2a3443f14240dc2de2604ec98e7bb801c9e97615
parent1332bbd6165b36860013c98483ecd1f8cb4c310d
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el