Merge commit '42604902292ebaba39b13e8efd98419908518019'

* commit '42604902292ebaba39b13e8efd98419908518019':
  Prepare for 11_beta1 Release

Conflicts:
	RELEASE

No change, not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-18 10:24:23 +02:00
commit ca2160b5b3

Diff Content Not Available