Merge branch 'maint'
commit96fe2dec3b281834598fdfa2b7d2f96ce35c8777
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Feb 2014 16:43:05 +0000 (25 17:43 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Feb 2014 16:43:05 +0000 (25 17:43 +0100)
treec07dc94d0c4865a4d71ca27be7c6cc13741463c3
parent64adcc75f57ccb5181226bfdea71cc79a5220f5f
parent0d7b052cfa804324ff03f16d223782f313e5c855
Merge branch 'maint'
lisp/ox-beamer.el