Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Aug 2014 12:11:40 +0000 (14:11 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Aug 2014 12:11:40 +0000 (14:11 +0200)
commitcc6aa45f3b41d73eddca21b67d487e47dc4d7433
treecc5bc415ca0023537c23d5e3e0503a5a15ce63b8
parent6b9108741bfbc7e7d1b45ccc843b315de15af362
parent1adec31993dc379dc60337245e05010645e4c40b
Merge branch 'maint'

Conflicts:
lisp/ox-texinfo.el
lisp/ox-texinfo.el