Merge branch 'maint'
commitd2c0bbcf52dee58a6f71690983395f891ba7869d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 22:08:12 +0000 (9 00:08 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 22:08:12 +0000 (9 00:08 +0200)
tree05cbd7d1d23a7f8fa4b7540a5a72b04fb135cca6
parenteb234d2b458b1f791b051f04e2904ab7866b60cc
parent1faeb4e680623027cab9c6c7637034c103cd3227
Merge branch 'maint'
lisp/ox-texinfo.el