]> 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: 276ce8a 71b2597)
Merge tag 'upstream/1.6.7'
authorRuss Allbery <rra@debian.org>
Wed, 9 Apr 2014 17:07:03 +0000 (10:07 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 9 Apr 2014 17:07:03 +0000 (10:07 -0700)
Upstream version 1.6.7

Conflicts:
NEWS
configure-libafs.ac
configure.ac
src/config/NTMakefile.amd64_w2k
src/config/NTMakefile.i386_nt40
src/config/NTMakefile.i386_w2k


Trivial merge