Merge commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:49:32 +0000 (14:49 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:49:32 +0000 (14:49 +0200)
* commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42':
  avdevice: Ignore timefilter test program

This commit is a noop, /timefilter entry was added in the original merge
(5d48e4eafa6c4559683892b8638d10508125f3cf)

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge