Merge branch 'maint' master
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)
1  2 
lisp/ox-texinfo.el

Simple merge