Merge commit '1cc6fef0671c5522c952671ee06bf973135a22c4' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 11:42:38 +0000 (12:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 11:42:38 +0000 (12:42 +0100)
commitdb61d34e83099a22d02500986d9135e4b5bceae8
treef3d730fa6df134b69c94058c80b91824ac8790f8
parent309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3
parent1cc6fef0671c5522c952671ee06bf973135a22c4
Merge commit '1cc6fef0671c5522c952671ee06bf973135a22c4' into release/2.4

* commit '1cc6fef0671c5522c952671ee06bf973135a22c4':
  Prepare for 11.1 Release

Conflicts:
RELEASE

Not merged, as our release numbers differ

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