From: Luk Claes <luk@debian.org>
Date: Fri, 10 May 2013 08:09:21 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.2.8-1~11
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=188e5ae9789bf0a7f8033f6aae40e65e652c7b08;p=nfs-utils.git

Merge branch 'upstream'
---

188e5ae9789bf0a7f8033f6aae40e65e652c7b08