Merge branch 'maint'
commit7346dbe79b7e72bb59d1378f023d15de848345fc
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 14 Jun 2013 19:42:42 +0000 (14 21:42 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 14 Jun 2013 19:42:42 +0000 (14 21:42 +0200)
tree2b34044d706cdbe05280a46f2db9b267036b7766
parentd316ecab0e55a4ad8bd438ee9d893285839e8caf
parent4fc03ec1fe23c6ddccffaa064a282b258ca8b6b8
Merge branch 'maint'
lisp/org.el
lisp/ox-latex.el