Merge branch 'maint'
commitde0fcdf3b81bd52f5ed0c81cac72f243e9234069
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 30 May 2013 18:33:24 +0000 (30 20:33 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 30 May 2013 18:33:24 +0000 (30 20:33 +0200)
tree49b01fefed1b630d7eb828b11e6415316b4cbc50
parentd4d865db5c62d6d32691fe579f53c276be84a345
parent0018428c256b09b964439fde75cca702b9ddcca6
Merge branch 'maint'
lisp/ox-latex.el
lisp/ox-texinfo.el