git.decadent.org.uk Git - nfs-utils.git/commit

author	Ben Hutchings <ben@decadent.org.uk>
	Fri, 11 Mar 2016 04:06:00 +0000 (04:06 +0000)
committer	Ben Hutchings <ben@decadent.org.uk>
	Fri, 11 Mar 2016 04:06:00 +0000 (04:06 +0000)
commit	405eb02c20c348307a696d3afc8b22d212a77cdb
tree	d2bd8e020888bf424626757ba105d49ad6a400cf	tree \| snapshot
parent	398d6252cb71a88dd999b3c8d6e2b4c82d224c01	commit \| diff
parent	5f33a379be5a2695cd5d4052756a7fcb4cef2517	commit \| diff

Merge branch 'sid'

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