Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Dec 2013 20:50:13 +0000 (21:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Dec 2013 20:50:13 +0000 (21:50 +0100)
* qatar/master:
  doc: Try to find nonstandard Perl path from the environment

Conflicts:
doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/texi2pod.pl

diff --cc doc/texi2pod.pl
Simple merge