Merge commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:14:42 +0000 (00:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:14:42 +0000 (00:14 +0100)
* commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2':
  Prepare for 11.3 Release

Conflicts:
RELEASE

Not merged

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

Trivial merge