Merge commit 'cbbb404055877e3beb9890ffe22784a6a100963e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:27:27 +0000 (15:27 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:27:27 +0000 (15:27 +0100)
commit1398ded7a77b2057a3e9983e3df512855b7ff0eb
treeb49506eaabe8b8cdf2992cdd2c5f28b9378f03ba
parent2f1a539d4b905a418aec4b420adcb7648eba5c64
parentcbbb404055877e3beb9890ffe22784a6a100963e
Merge commit 'cbbb404055877e3beb9890ffe22784a6a100963e'

* commit 'cbbb404055877e3beb9890ffe22784a6a100963e':
  fate: Restore order of h264 entries

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tests/fate/h264.mak