From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 3 Sep 2011 01:11:36 +0000 (+1000)
Subject: Merge branch 'master' into win32-3
X-Git-Tag: upstream/1.9.6^2~325
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=4ed97718b3699a76047741b9c21df7357d8fe513;p=deb_libnfs.git

Merge branch 'master' into win32-3
---

4ed97718b3699a76047741b9c21df7357d8fe513