diff options
author | dfr <dfr@FreeBSD.org> | 2008-05-08 11:01:46 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 2008-05-08 11:01:46 +0000 |
commit | 62929665b739d66740a668830f004f9463f3ced9 (patch) | |
tree | 29031943aed09b2fbdbdc248e2868d86477d1ea3 /kerberos5 | |
parent | e240fee79046f8dbba1a0ff52d7d6d7db5d9ecf4 (diff) | |
download | FreeBSD-src-62929665b739d66740a668830f004f9463f3ced9.zip FreeBSD-src-62929665b739d66740a668830f004f9463f3ced9.tar.gz |
Merge from the vendor branch and resolve conflicts.
Diffstat (limited to 'kerberos5')
0 files changed, 0 insertions, 0 deletions