Merge branch 'maint'
commit0b59a5994ed170e1f17e13e09fd34aeba6da4ae9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Mar 2016 09:11:24 +0000 (10 10:11 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Mar 2016 09:11:24 +0000 (10 10:11 +0100)
tree1bec82afa7494a2a47390bf4bf30ebe81ced2054
parentd5a603db1f7b2f59e7a635649ede12aac68cf63f
parent5a735b0b8045966fab57f035a694a65209d3bd80
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el