Merge branch 'maint'
commita9eec72ecffdf3b23886bbdc70d5809cb34be3a8
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 25 Nov 2013 22:36:38 +0000 (25 23:36 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 25 Nov 2013 22:36:38 +0000 (25 23:36 +0100)
tree84fd900d607d98b28f71c26c948487b1a76aadfa
parentbe8a1a2d69c10118985a607710a4defb823d1112
parent3ead82a3211c011428289930c33ea9094e602312
Merge branch 'maint'
lisp/org-element.el
lisp/ox-publish.el