Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Apr 2012 00:25:43 +0000 (02:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Apr 2012 00:25:49 +0000 (02:25 +0200)
* qatar/release/0.5:
  id3v2: fix skipping extended header in id3v2.4

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

Trivial merge