Merge commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:16:15 +0000 (00:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:16:15 +0000 (00:16 +0100)
* commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33':
  doc: Update changelog for v11.3

Conflicts:
Changelog

Not merged, the changelog is not correct for FFmpeg

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

Trivial merge