From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Mon, 1 Dec 2014 18:01:56 +0000 (+0100)
Subject: Merge tag 'libnfs-1.9.6' of https://github.com/sahlberg/libnfs into upstream
X-Git-Tag: upstream/1.9.6
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=refs%2Fheads%2Fupstream;p=deb_libnfs.git

Merge tag 'libnfs-1.9.6' of https://github.com/sahlberg/libnfs into upstream

Tag for 1.9.6

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

Conflicts:
	README
	configure.ac
	examples/fuse_nfs.c
	include/nfsc/libnfs-zdr.h
	include/nfsc/libnfs.h
	lib/Makefile.am
	lib/libnfs-sync.c
	lib/libnfs-zdr.c
	lib/libnfs.c
	lib/socket.c
	nfs/Makefile.am
	nfs/libnfs-raw-nfs.c
	nfs/libnfs-raw-nfs.h
	nfs/nfs.c
	nfs/nfs.x
	nlm/libnfs-raw-nlm.c
	nlm/libnfs-raw-nlm.h
	nlm/nlm.x
	packaging/RPM/libnfs.spec.in
---

00e29b2c0b8b0e7885e724f732c0d259c1f8419f