From: Russ Allbery <rra@debian.org>
Date: Wed, 9 Apr 2014 17:07:03 +0000 (-0700)
Subject: Merge tag 'upstream/1.6.7'
X-Git-Tag: debian/1.6.7-1~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a1484ceaeeefca5005ffeb6042ff9357551ef3db;p=packages%2Fo%2Fopenafs.git

Merge tag 'upstream/1.6.7'

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
---

a1484ceaeeefca5005ffeb6042ff9357551ef3db