]> 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: 8d75898 e6b5702)
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)
Conflicts:
src/kauth/admin_tools.c


Trivial merge