]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
projects / packages / o / openafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 772a378 5f5b02a)
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)
Merge the changes necessary for OpenAFS-SA-2013-003 and
OpenAFS-SA-2013-004 back into the stable branch.


Trivial merge