Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:56:09 +0000 (03:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:56:09 +0000 (03:56 +0100)
* commit '4039f11ed82d84009b5146f0a563f33ced33e4db':
  Prepare for 11.2 Release

Conflicts:
RELEASE

Merge for metadata only as this is not correct for 2.4.*

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

Trivial merge