Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 20:08:15 +0000 (22:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 20:08:15 +0000 (22:08 +0200)
* commit '5caf039ba2b4be067568a30146f29008d8db28d0':
  Prepare for 11_beta2 Release

Conflicts:
RELEASE

Not merged as theres no FFmpeg 11_beta2

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge