From: Luk Claes <luk@debian.org>
Date: Sun, 2 Oct 2011 14:47:26 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.2.5-1~11
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3ad7dea527170ae12c9cdc2e428d0676ac261144;p=nfs-utils.git

Merge branch 'upstream'
---

3ad7dea527170ae12c9cdc2e428d0676ac261144