Merge branch 'zdr'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 28 Nov 2012 02:22:27 +0000 (18:22 -0800)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 28 Nov 2012 02:22:27 +0000 (18:22 -0800)
Manually fixyp some merge conflicts in :
lib/init.c
lib/pdu.c
lib/socket.c
nfs/Makefile.am
nfs/nfs.x
nlm/Makefile.am


No differences found