From: Andres Mejia <mcitadel@gmail.com>
Date: Sun, 24 Jul 2011 18:15:59 +0000 (-0400)
Subject: Merge commit 'upstream/0.0_git20110724.48593f5'
X-Git-Tag: debian/0.0_git20110724.48593f5-1~1
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=2b904af3b52fe6b2b2d889e6b5f76f5b00693f96;p=deb_libnfs.git

Merge commit 'upstream/0.0_git20110724.48593f5'
---

2b904af3b52fe6b2b2d889e6b5f76f5b00693f96