[FFmpeg-cvslog] Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 04:26:20 2014 +0200| [8f23045b169e439e9d1f587ecfda2ad1c345d6f5] | committer: Michael Niedermayer

Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'

* commit 'be59675add2a05a7400b1abf86201ab069d7b1dd':
  doc: Change the multitable rendering in texi2pod

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f23045b169e439e9d1f587ecfda2ad1c345d6f5
---