Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:22:40 +0000 (12:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 10:23:34 +0000 (12:23 +0200)
commit83bfcc3ce2554bd12d5eb790836530d3430bd908
treeb56569d3f6225dcaadbfe66cc6aa3f6fa55f96e6
parent8778c49aceb99b3a9f5f1ce30d011755e12952a9
parent6b081eff4dfc3c899960f69f30cb567266b7dca3
Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'

* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3':
  fate: add vorbiscomment cover art test

Conflicts:
tests/fate/cover-art.mak

See: 1ca3902726fb8c1398ab00d146ebe3e2f31b76e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/cover-art.mak