From: Ben Hutchings Date: Tue, 29 Mar 2011 03:28:46 +0000 (+0100) Subject: Merge commit 'upstream/1.2.3' X-Git-Tag: debian/1%1.2.3-1~9 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=38861db18a0687aaf483ea0bf03bf8c928ca0980;p=nfs-utils.git Merge commit 'upstream/1.2.3' Conflicts: Makefile.in aclocal.m4 configure linux-nfs/Makefile.in support/Makefile.in support/export/Makefile.in support/include/Makefile.in support/include/config.h.in support/include/nfs/Makefile.in support/include/rpcsvc/Makefile.in support/include/sys/Makefile.in support/include/sys/fs/Makefile.in support/misc/Makefile.in support/nfs/Makefile.in support/nsm/Makefile.in tests/Makefile.in tests/nsm_client/Makefile.in tools/Makefile.in tools/locktest/Makefile.in tools/nlmtest/Makefile.in tools/rpcdebug/Makefile.in tools/rpcgen/Makefile.in utils/Makefile.in utils/exportfs/Makefile.in utils/gssd/Makefile.in utils/idmapd/Makefile.in utils/mount/Makefile.in utils/mountd/Makefile.in utils/nfsd/Makefile.in utils/nfsstat/Makefile.in utils/showmount/Makefile.in utils/statd/Makefile.in --- 38861db18a0687aaf483ea0bf03bf8c928ca0980