From: Simon Wilkinson <sxw@your-file-system.com>
Date: Wed, 24 Jul 2013 15:10:28 +0000 (+0100)
Subject: Merge branch 'rxkad-kdf-1.6' into origin/openafs-stable-1_6_x
X-Git-Tag: upstream/1.6.5.1^2~11
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2f411f4f8c3e1116cb9bc515db598eda1e6cea1b;p=packages%2Fo%2Fopenafs.git

Merge branch 'rxkad-kdf-1.6' into origin/openafs-stable-1_6_x

Merge the changes necessary for OpenAFS-SA-2013-003 and
OpenAFS-SA-2013-004 back into the stable branch.
---

2f411f4f8c3e1116cb9bc515db598eda1e6cea1b