Merge tag 'libnfs-1.9.6' of https://github.com/sahlberg/libnfs into upstream upstream upstream/1.9.6
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 18:01:56 +0000 (19:01 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 18:01:56 +0000 (19:01 +0100)
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


Trivial merge