[FFmpeg-cvslog] Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 11:49:47 2013 +0200| [99091ff217440daa33fddcf66170e1a6d630c3a4] | committer: Michael Niedermayer

Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'

* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
	doc/ffmpeg.texi

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

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