From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 14 Jul 2010 01:29:37 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.0.8-1~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1408e610ac2db753543a546c4312b2eb6799f044;p=nfs-utils.git

Merge branch 'upstream'

Conflicts:
	config.guess
	config.sub
	configure
	debian/changelog
	debian/control
	debian/etc.exports
	debian/nfs-common.default
	debian/nfs-common.dirs
	debian/nfs-common.init
	debian/nfs-common.install
	debian/nfs-common.postinst
	debian/nfs-common.postrm
	debian/nfs-common.prerm
	debian/nfs-kernel-server.default
	debian/nfs-kernel-server.dirs
	debian/nfs-kernel-server.init
	debian/nfs-kernel-server.postinst
	debian/nfs-kernel-server.postrm
	debian/nfs-kernel-server.prerm
	debian/rules
	utils/gssd/Makefile
	utils/svcgssd/Makefile
---

1408e610ac2db753543a546c4312b2eb6799f044