From: Luk Claes <luk@debian.org>
Date: Sat, 9 Jul 2011 10:23:15 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.2.4-1~5
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4bbd6d624c000f26ab828852ee90a4624df26c49;p=nfs-utils.git

Merge branch 'upstream'
---

4bbd6d624c000f26ab828852ee90a4624df26c49