Merge branch 'maint'
commit4bc07758a5c7bd85b7514303a62815201a74ded1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 6 Apr 2016 20:28:16 +0000 (6 22:28 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 6 Apr 2016 20:28:16 +0000 (6 22:28 +0200)
tree09cacc25b9b0f787c0625de6f1ff67ed0eb552dc
parent716e339c9651ca920037906e5affb6049bdaa421
parent9c6811b9d42199fd37f77b74a3a4b2bf17a820be
Merge branch 'maint'
lisp/ox-texinfo.el