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)
commitca2160b5b3d9aec02d7c1d93e445b8cfb9c7716c
tree18784a98ada57123f637d8aa5ebc134f0e1d856b
parent4ddb3a6df0f6ad053c8455e074c1e6688b051272
parent42604902292ebaba39b13e8efd98419908518019
Merge commit '42604902292ebaba39b13e8efd98419908518019'

* commit '42604902292ebaba39b13e8efd98419908518019':
  Prepare for 11_beta1 Release

Conflicts:
RELEASE

No change, not merged

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