Merge branch 'maint'
commit4788a58e7172c326bce3fa50aecc784ae6ff3a3e
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 18 Jun 2013 20:48:08 +0000 (18 22:48 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 18 Jun 2013 20:48:08 +0000 (18 22:48 +0200)
tree5b784d589459ff702bf0c11b92e2e15473b03dd3
parent5e3c3f93bf4c770045f292037ce817b185211b86
parent7b8a79326fae64f40b20e3a50c02a5a40f1c0b62
Merge branch 'maint'
lisp/ox-latex.el
lisp/ox.el