From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 11 Mar 2016 04:06:00 +0000 (+0000)
Subject: Merge branch 'sid'
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=405eb02c20c348307a696d3afc8b22d212a77cdb;hp=405eb02c20c348307a696d3afc8b22d212a77cdb

Merge branch 'sid'

Merge the uploaded changes and update the version for the open changelog entry.
---