Merge branch 'rxkad-kdf-master' into HEAD
authorSimon Wilkinson <sxw@your-file-system.com>
Wed, 24 Jul 2013 14:55:26 +0000 (15:55 +0100)
committerSimon Wilkinson <sxw@your-file-system.com>
Wed, 24 Jul 2013 14:55:26 +0000 (15:55 +0100)
commit92148709443ed622bd25aba38e83b25ca77950a1
tree888ba3f39cb171b129584dc0ef043784880a68a5
parente2d458c11956af6fe721f7151487cb19f07ac16f
parente79102e7918ce5196e870a806879135743ec3abb
Merge branch 'rxkad-kdf-master' into HEAD

Merge the current OpenAFS master branch with the branch on which
OpenAFS-SA-2013-003 and OpenAFS-SA-2013-004 were developed.