proper merge debian/1%1.2.6-1
authorLuk Claes <luk@debian.org>
Fri, 25 May 2012 20:20:09 +0000 (22:20 +0200)
committerLuk Claes <luk@debian.org>
Fri, 25 May 2012 20:20:09 +0000 (22:20 +0200)
commit9a5293a10551c03b4fb976503dd24da569fcadb3
tree3fafd604859c096f6de357e1ac2d3f4aeaddf5a0
parentfb9a269a1da825d06363b04f74fd9b70b8ca3eb4
proper merge
42 files changed:
Makefile.in
aclocal/kerberos5.m4
configure
linux-nfs/Makefile.in
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.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/mountstats/Makefile.in
tools/nfs-iostat/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/exportfs/nfsd.man
utils/gssd/Makefile.in
utils/gssd/gss_util.c
utils/gssd/gssd_proc.c
utils/idmapd/Makefile.in
utils/mount/Makefile.in
utils/mount/fstab.c
utils/mount/fstab.h
utils/mount/mount.c
utils/mount/mount.nfs.man
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsd/nfsd.man
utils/nfsstat/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in
utils/statd/statd.c