]> git.michaelhowe.org Git - packages/o/openafs.git/commit
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)
commit847dd0aa2b3b747422bc643b01f4d464a514f75f
treea20c5af446d0c953c1d64f158218b38efd225ad4
parentc5343f725f67d22769693c474cb828ef43bec32e
parenta75274d87435e0a085fa3a48541acc98170f07df
Merge branch 'upstream' into feature/multiple-local-realms

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