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:
Michael Niedermayer 2014-02-16 02:24:52 +01:00
commit bbd8fd0371

Diff Content Not Available