Merge branch 'maint'
commit21b11071d3d8caeaf6ad3e79c427b9e5088239cb
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 7 Oct 2013 15:06:10 +0000 (7 17:06 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 7 Oct 2013 15:06:10 +0000 (7 17:06 +0200)
tree65a1f8a6f3043b81d376c91db96e3384c04747d5
parent8aaf3c9748b6ef8bd5782108ae382f59efef1903
parent655f62dbbb7bacd88984ab2d206f3426e1cd2f18
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el