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)
commite3601ceeb87516ac141605a41193aa4d726a2cf8
tree1cb992083d840480146a76d551b7c1be9a52e0b2
parent9bff8cfc913e55c2fb0f12be3d7ed06b681166c6
parent5caf039ba2b4be067568a30146f29008d8db28d0
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>