Merge branch 'maint'
commit09ee2336efd053b06dfc116379167b4ccd04387e
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 24 Mar 2014 12:59:44 +0000 (24 13:59 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 24 Mar 2014 12:59:44 +0000 (24 13:59 +0100)
treef343cd3dc011c5e84e98a31c3b65e8adc3e76b48
parentbf27c6b71f8b3d94046e80800bd2e4b32f117e2e
parent33dce5b98feeb0140ef9fe8e55389ad3e1d772cb
Merge branch 'maint'
lisp/ox-beamer.el
lisp/ox-latex.el