From: Simon Wilkinson <sxw@your-file-system.com>
Date: Wed, 24 Jul 2013 14:55:26 +0000 (+0100)
Subject: Merge branch 'rxkad-kdf-master' into HEAD
X-Git-Tag: upstream/1.8.0_pre1^2~1062
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=92148709443ed622bd25aba38e83b25ca77950a1;p=packages%2Fo%2Fopenafs.git

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.
---

92148709443ed622bd25aba38e83b25ca77950a1