Merge branch 'maint'
commit230d09aeb0a9914ed1c5e377b0b84b7064370c6d
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 24 Mar 2014 13:20:23 +0000 (24 14:20 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 24 Mar 2014 13:20:23 +0000 (24 14:20 +0100)
treec761a1c074b31e6b3f1e1db733417b581ba84079
parent09ee2336efd053b06dfc116379167b4ccd04387e
parent2e79bd8119a0c8ec1141873706b04aa6fe3d932f
Merge branch 'maint'
contrib/lisp/ox-groff.el
lisp/org-element.el
lisp/org.el
lisp/ox-ascii.el
lisp/ox-beamer.el
lisp/ox-html.el
lisp/ox-latex.el
lisp/ox-md.el
lisp/ox-odt.el
testing/lisp/test-org-element.el
testing/lisp/test-ox.el