Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Aug 2014 17:48:58 +0000 (19:48 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Aug 2014 17:48:58 +0000 (19:48 +0200)
commit644e602343fc500cf25041c6dc95fadafb50da4f
tree316db041e0cea2a0f9e2d20c4e7084a5b3581d54
parent0a180959842e8356c1c82d497c56b0bc1be3166a
parente112f3c0df49264998d4ae8df545c9940692f68f
Merge branch 'maint'
lisp/ox-texinfo.el