From: Russ Allbery <rra@debian.org>
Date: Wed, 1 Apr 2009 01:33:47 +0000 (-0700)
Subject: Merge branch 'upstream' into feature/multiple-local-realms
X-Git-Tag: debian/1.4.10+dfsg1-1~30^2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=847dd0aa2b3b747422bc643b01f4d464a514f75f;p=packages%2Fo%2Fopenafs.git

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
---

847dd0aa2b3b747422bc643b01f4d464a514f75f