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)
commit61b5dee49e74c400647951d1b0c26bb88116efb5
tree2d87e77e13da7a1ad5913f0d27e1caa1a0b4a287
parentd8f6c5a79c10dff1c8e5717d760aec194fb81d9c
parentfc3c1156e361202ab97ad63ffb4dacc416906d33
Merge commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33' into release/2.4

* 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>