]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge commit 'upstream/1.5.74.1' into experimental
authorRuss Allbery <rra@debian.org>
Tue, 4 May 2010 23:18:38 +0000 (16:18 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 4 May 2010 23:18:38 +0000 (16:18 -0700)
commite811e32dc1408a4b07f220b9785b9431ceff78ca
treeee43d0da8c88085e913a9ec2ae5744d92dfc7b3b
parent8d75898b047a427658b6a17b30b531a61414a77b
parente6b5702f5cb51cdf222a689c5d4f8c268eaa7a60
Merge commit 'upstream/1.5.74.1' into experimental

Conflicts:
src/kauth/admin_tools.c