Merge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:04:02 +0000 (00:04 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:04:26 +0000 (00:04 +0200)
* commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead':
  fate: Add hap-chunk ref file

Conflicts:
tests/ref/fate/hap-chunk

See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge