Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 29 Jul 2015 23:27:36 +0000 (01:27 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 29 Jul 2015 23:28:00 +0000 (01:28 +0200)
* commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083':
  fate: add test vectors for HMAC SHA and SHA-2

Conflicts:
libavutil/hmac.c
tests/ref/fate/hmac

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

Trivial merge