]> git.michaelhowe.org Git - packages/o/openafs.git/commit
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)
commiteb63658b6021f0db7a87aafcb79953c2c818905f
tree470e1178529132dfb97125664fef201a6aa95986
parent86789ad400a51e1b89d7394a7c0f1ff369a0d83d
parentb6162a0b72244913b8b89027dd498aa74c6cf85e
Merge commit 'upstream/1.6.1.pre1'

Conflicts:
src/libuafs/Makefile.common.in
src/viced/afsfileprocs.c