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>
This commit is contained in:
Michael Niedermayer 2014-12-02 12:42:38 +01:00
commit db61d34e83

Diff Content Not Available