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/?a=commitdiff_plain;h=cf68d913577423279082a85becffd0336e98fff2;p=nfs-utils.git

Merge branch 'upstream'
---

cf68d913577423279082a85becffd0336e98fff2