]> 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: c469500 f6a68c6)
Merge tag 'upstream/1.6.2.1'
authorRuss Allbery <rra@debian.org>
Mon, 8 Apr 2013 18:16:31 +0000 (11:16 -0700)
committerRuss Allbery <rra@debian.org>
Mon, 8 Apr 2013 18:16:31 +0000 (11:16 -0700)
Upstream version 1.6.2.1

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


Trivial merge