From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Mon, 1 Dec 2014 18:10:59 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.9.6-1ubuntu1~2
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=816d06fd09beb1a4ccbe2c97d2007b489366ab69

Merge branch 'upstream'
---

816d06fd09beb1a4ccbe2c97d2007b489366ab69