tree d17bf0c017fb51aa1a9fe20524c5492ee83c2e8e
parent 7209c2b13f0bfaf4029ebb54a18ebb6959d2e3a3
parent 15df4428d264287ec1577f92296b178f86cbe14d
author Michael Niedermayer <michaelni@gmx.at> 1326402841 +0100
committer Michael Niedermayer <michaelni@gmx.at> 1326402850 +0100

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Release notes and changelog for 0.5.7
  Bump version number for 0.5.7 release.
  vorbis: An additional defense in the Vorbis codec.
  vorbisdec: Fix decoding bug with channel handling

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