Merge branch 'maint'
commit2e98c7f43ea09a7049eb745af3f8962780fbb42f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Aug 2014 13:45:35 +0000 (11 15:45 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Aug 2014 13:45:35 +0000 (11 15:45 +0200)
tree387742a2abdabd9d08b0bfaf01b4aeae16d66264
parentca46777144968c9f522b5a56006dfaf82be18b5b
parent7286925b7d8c9c3e37e2e1404d5fcc867456a937
Merge branch 'maint'
lisp/ox-texinfo.el