Merge branch 'maint'
commit80525f53845a4f2500da78dbe31a3e024cbdf1a7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 20:42:45 +0000 (8 22:42 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 20:42:45 +0000 (8 22:42 +0200)
tree50bbb2679c0053cbaddff11ffc13a8a55a40d927
parentb1406dcddb6ae8abe7a8b14614cb91a94c55603f
parent70fce0270f544c85250d34662e606d54f5b1605e
Merge branch 'maint'
lisp/ox-texinfo.el