Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'
authorClément Bœsch <clement@stupeflix.com>
Thu, 23 Jun 2016 10:16:42 +0000 (12:16 +0200)
committerClément Bœsch <clement@stupeflix.com>
Thu, 23 Jun 2016 10:16:42 +0000 (12:16 +0200)
* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
  fate: Update fate-lavf-ts after commit 393596f9d5

This commit is a noop, see c0ff42bf6468c7440568ec15c81edc52289f0c8a

Merged-by: Clément Bœsch <clement@stupeflix.com>

Trivial merge