]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge commit 'upstream/1.5.50.dfsg1' into experimental
authorRuss Allbery <rra@debian.org>
Wed, 16 Jul 2008 21:37:58 +0000 (14:37 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 16 Jul 2008 21:37:58 +0000 (14:37 -0700)
commitdb1235cb990526f86e5568c189038c0017ba5bc4
tree0f74f3221734f96d8026ebcd8cc7d364519e7301
parent9ed4f7dd466f4ad6ba4887c417adc7724aa3671d
parent219db433644b175c157662fe5789a8412a377bd2
Merge commit 'upstream/1.5.50.dfsg1' into experimental

Conflicts:

configure.in
src/afs/LINUX/osi_groups.c
src/afs/LINUX/osi_module.c
src/audit/audit.c
src/auth/auth.p.h
src/auth/userok.c
src/cf/linux-test4.m4
src/cf/osconf.m4
src/config/param.alpha_linux_26.h
src/libafs/MakefileProto.LINUX.in
src/pam/Makefile.in
src/ptserver/pt_util.c
src/ptserver/ptprocs.c
src/tviced/Makefile.in
src/util/Makefile.in
src/util/dirpath.c
src/util/dirpath.hin
src/util/dirpath_nt.h
src/util/get_krbrlm.c
src/viced/host.c
src/viced/viced.c
configure.in
src/bozo/bosoprocs.c
src/cf/osconf.m4
src/pam/Makefile.in
src/util/Makefile.in
src/venus/fstrace.c