Merge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:25:41 +0000 (10:25 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:25:41 +0000 (10:25 +0200)
commit11014dd3d47b5ba974972dc3fb3796074e27b6df
tree89538d41f92d5a4565504c3a1b9f51a41a58f9e3
parentc864de3c8ff5e83dacdd18be9eb42c2e060263a9
parentfaa3f17a76333b672ce4a40cf80f678ab68bdbae
Merge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae'

* commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae':
  fate: test only demuxing in asf-repldata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tests/fate/microsoft.mak
tests/ref/fate/asf-repldata