Merge branch 'hmac' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 7 Aug 2015 23:12:08 +0000 (01:12 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 7 Aug 2015 23:12:08 +0000 (01:12 +0200)
commit849fb4fbe5ae95e7c82070aba5de5179d617e82e
tree46030dc256d7b04fa67cfafda08e9d80f5d3582b
parentb31ed1db489602fd2167983243f34ddb0a335d20
parent1861a13b5fe4bbdcc4553d8ef831bae6655a5de6
Merge branch 'hmac' into next