err.no Git - util-linux/commit

]> err.no Git - util-linux/commit

author	LaMont Jones <lamont@debian.org>
	Fri, 30 Jan 2009 15:12:07 +0000 (08:12 -0700)
committer	LaMont Jones <lamont@debian.org>
	Fri, 30 Jan 2009 15:12:07 +0000 (08:12 -0700)
commit	37ce2d507aadc9d2206d32f4aeda6a9d13f6da7a
tree	e031e6702871dfe831db739429707867ea1c2848	tree \| snapshot
parent	7f0a76776db11aba14981e03b73a8f22e9aef96c	commit \| diff
parent	3def48692bb6266b50d7a5d264b3b2d55bae1392	commit \| diff

Merge commit 'origin/stable/v2.14' into stable/v2.14

Conflicts:

mount/mount.8

Unnamed repository; edit this file 'description' to name the repository.