From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Fri, 31 May 2013 00:59:24 +0000 (-0700)
Subject: Merge branch 'master' of github.com:sahlberg/libnfs
X-Git-Tag: upstream/1.9.6^2~192
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=7e66b2894704187c0497398ffdff12b1de0679e5;p=deb_libnfs.git

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

7e66b2894704187c0497398ffdff12b1de0679e5