From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Thu, 8 Mar 2012 22:25:02 +0000 (+1100)
Subject: Merge branch 'master' of github.com:sahlberg/libnfs
X-Git-Tag: upstream/1.9.6^2~263
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f314b3df7df086ced6ffb18e03db900ad2ea5567;p=deb_libnfs.git

Merge branch 'master' of github.com:sahlberg/libnfs
---

f314b3df7df086ced6ffb18e03db900ad2ea5567