]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge branch 'rxkad-kdf-1.6' into origin/openafs-stable-1_6_x
authorSimon Wilkinson <sxw@your-file-system.com>
Wed, 24 Jul 2013 15:10:28 +0000 (16:10 +0100)
committerSimon Wilkinson <sxw@your-file-system.com>
Wed, 24 Jul 2013 15:10:28 +0000 (16:10 +0100)
commit2f411f4f8c3e1116cb9bc515db598eda1e6cea1b
tree21aa75d5a204cd5390b38db900f763bbe3a9fe99
parent772a378bc412d62e25dfa5d4d8b3c854ee8b604a
parent5f5b02a57102af1a85fb9bdaaec31b6094d0c9c4
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.