Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Aug 2013 06:53:22 +0000 (08:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Aug 2013 06:58:59 +0000 (08:58 +0200)
* qatar/master:
  FATE: add a TAK test

Conflicts:
tests/fate/lossless-audio.mak

No change as we already have a tak test with luckynight-partial.tak

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

Trivial merge