Merge commit '42604902292ebaba39b13e8efd98419908518019'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 08:24:23 +0000 (10:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 08:24:23 +0000 (10:24 +0200)
* commit '42604902292ebaba39b13e8efd98419908518019':
  Prepare for 11_beta1 Release

Conflicts:
RELEASE

No change, not merged

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

Trivial merge