Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'
* commit '5caf039ba2b4be067568a30146f29008d8db28d0': Prepare for 11_beta2 Release Conflicts: RELEASE Not merged as theres no FFmpeg 11_beta2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
e3601ceeb8