From: Luk Claes <luk@debian.org>
Date: Fri, 25 May 2012 20:20:09 +0000 (+0200)
Subject: proper merge
X-Git-Tag: debian/1%1.2.6-1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9a5293a10551c03b4fb976503dd24da569fcadb3;hp=9a5293a10551c03b4fb976503dd24da569fcadb3;p=nfs-utils.git

proper merge
---