From: Andres Mejia <mcitadel@gmail.com>
Date: Sun, 8 Jan 2012 18:14:01 +0000 (-0500)
Subject: Merge commit 'upstream/1.2.0'
X-Git-Tag: debian/1.2.0-1~7
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=ea9082f2001b5b0e321cd44733343f021e2bc313

Merge commit 'upstream/1.2.0'
---

ea9082f2001b5b0e321cd44733343f021e2bc313