Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 19 Aug 2014 21:37:37 +0000 (23:37 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 19 Aug 2014 21:37:37 +0000 (23:37 +0200)
commit258b572cd4f37bea4a6437954d4a57c4bb66b6ac
tree2d8b2843668cefa0264ea2352774a30a89bc2de9
parent3a1fff1b22c01c9ab4e8d31b8bc4a805a8bc1f89
parentf2ac6db0a6589b52cc75d6ea754fe07c8c7017a3
Merge branch 'maint'
lisp/ox-texinfo.el