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

Merge branch 'upstream'

Conflicts:
	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
	support/nfs/exports.c
	utils/mountd/mountd.c
	utils/mountd/mountd.man
---

f8d5dd05dd28fe122832b229c5298d254eb4b581