Merge commit '8de77b665d2a2f1cd560d2183fd4664298b30715'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 23:33:41 +0000 (01:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 23:33:41 +0000 (01:33 +0200)
* commit '8de77b665d2a2f1cd560d2183fd4664298b30715':
  fate: Add fic-in-avi test

Conflicts:
tests/ref/fate/fic-avi

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

Trivial merge