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)
* commit '1cc6fef0671c5522c952671ee06bf973135a22c4':
  Prepare for 11.1 Release

Conflicts:
RELEASE

Not merged, as our release numbers differ

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

Trivial merge