]> 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: 86789ad b6162a0)
Merge commit 'upstream/1.6.1.pre1'
authorRuss Allbery <rra@debian.org>
Tue, 20 Dec 2011 20:45:53 +0000 (12:45 -0800)
committerRuss Allbery <rra@debian.org>
Tue, 20 Dec 2011 20:45:53 +0000 (12:45 -0800)
Conflicts:
src/libuafs/Makefile.common.in
src/viced/afsfileprocs.c


Trivial merge