Merge remote-tracking branch 'qatar/master'
* qatar/master: Prepare for 10_beta1 Release Conflicts: RELEASE merge only for metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
bbd8fd0371
* qatar/master: Prepare for 10_beta1 Release Conflicts: RELEASE merge only for metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>