]> 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: c5343f7 a75274d)
Merge branch 'upstream' into feature/multiple-local-realms
authorRuss Allbery <rra@debian.org>
Wed, 1 Apr 2009 01:33:47 +0000 (18:33 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 1 Apr 2009 01:33:47 +0000 (18:33 -0700)
Conflicts:
src/audit/audit.c
src/auth/userok.c
src/ptserver/ptprocs.c
src/util/get_krbrlm.c
src/viced/host.c
src/viced/viced.c


Trivial merge