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@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 03:54:58 +01:00
commit 2b95572b10

Diff Content Not Available