Merge commit '94f084324e648876508bed546d950762f10b875e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:24:47 +0000 (12:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:24:47 +0000 (12:24 +0200)
commit4d13d440ee75321523be88fff1f38f3a154c53b5
treec09dc50e69953b1bb09ad7e04dc07112f26a6487
parenteacf42dd50885936ae05dd7fd415c4544b9f41cf
parent94f084324e648876508bed546d950762f10b875e
Merge commit '94f084324e648876508bed546d950762f10b875e'

* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
doc/texi2pod.pl

See: 12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/texi2pod.pl