[FFmpeg-cvslog] Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 03:54:58 2015 +0100| [2b95572b10ec8188f7e4061046a0c66a8ebd8e85] | committer: Michael Niedermayer

Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4

* commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4':
  doc: Update the Changelog for release 11.2

Conflicts:
	Changelog

No change as the changelog is not correct for FFmpeg

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

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