Merge branch 'maint'
commit379e2b1beaa4a6c83b3856ac5eb1256bb279a7be
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 7 Oct 2013 17:10:46 +0000 (7 19:10 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 7 Oct 2013 17:10:46 +0000 (7 19:10 +0200)
tree997913b444fbc55634e6e99bb05ac05fc38e0731
parent21b11071d3d8caeaf6ad3e79c427b9e5088239cb
parent2280ad5eca94ae3f8d91f854effca87dda732b4c
Merge branch 'maint'
testing/lisp/test-ox.el