Merge branch 'maint'
commit2629b767b1ead75cf74da7361757c80f323eea8f
authorBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:30:59 +0000 (5 14:30 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:30:59 +0000 (5 14:30 +0200)
treeb3af5ce8262b5659c9e62b4d63636089d32e619f
parentaab08b5e36f42deef9a8c93162820ad04c254d76
parent848240c1cfad186421a4be1e07816e1617371e3b
Merge branch 'maint'
lisp/org-agenda.el
lisp/ox-latex.el