Merge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:45:40 +0000 (13:45 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 12:14:21 +0000 (14:14 +0200)
commit72ed8d8bd2e428a83bf3e52b38fc7b8e3e86f762
tree68000c978f756bb0f09cc75ecb48e701ea3ec150
parent2c2957e23f616123f6ab7f3d14ee0d172d50c382
parent1982d0cc561912d685a0c2dbe58bc19f50bae231
Merge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'

* commit '1982d0cc561912d685a0c2dbe58bc19f50bae231':
  fate: Add test for MTS2/MSS4

The timestamps differ because we use a more appropriate timebase.

Merged-by: Clément Bœsch <clement@stupeflix.com>
tests/fate/microsoft.mak
tests/ref/fate/mts2