Merge branch 'maint'
commit83a55c6f5b14b3f48afba05c737ab07d2e3dc3d1
authorBastien Guerry <bzg@altern.org>
Fri, 21 Mar 2014 11:51:16 +0000 (21 12:51 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 21 Mar 2014 11:51:16 +0000 (21 12:51 +0100)
treec97b10ef62812a57fde46be147b685d683315c85
parent343a6dd0824e27f5e3a6a3a076955eef811d20f1
parent5a195423d3659aa46032e753ad7b704c9543b804
Merge branch 'maint'
lisp/org.el
lisp/ox-latex.el