From: Luk Claes <luk@debian.org>
Date: Fri, 25 May 2012 17:13:06 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.2.6-1~9
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=cf68d913577423279082a85becffd0336e98fff2;hp=-c

Merge branch 'upstream'
---

cf68d913577423279082a85becffd0336e98fff2
diff --combined .gitignore
index ea08c2e,96f9750..29f8e52
--- a/.gitignore
+++ b/.gitignore
@@@ -49,6 -49,7 +49,7 @@@ utils/rquotad/rquota
  utils/rquotad/rquota.h
  utils/rquotad/rquota_xdr.c
  utils/showmount/showmount
+ utils/nfsdcld/nfsdcld
  utils/statd/statd
  tools/locktest/testlk
  tools/getiversion/getiversion
@@@ -70,4 -71,3 +71,4 @@@ utils/nfsidmap/nfsidma
  cscope.*
  # generic editor backup et al
  *~
 +.pc