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)
commitfa1ca88cb6fcd36b39599c4f2608a774909c1645
treee40c02b714170f59e239a55d1a2bae9fd10be070
parent2b95572b10ec8188f7e4061046a0c66a8ebd8e85
parent4039f11ed82d84009b5146f0a563f33ced33e4db
Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4

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