err.no Git - util-linux/commit

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

author	LaMont Jones <lamont@debian.org>
	Wed, 16 Apr 2008 04:59:28 +0000 (22:59 -0600)
committer	LaMont Jones <lamont@debian.org>
	Wed, 16 Apr 2008 04:59:28 +0000 (22:59 -0600)
commit	769434fc28227d4f83ca6da9d7271b734811fd1c
tree	0eaf54de54c4368cb8ba7747ffcb1874bf34b81c	tree \| snapshot
parent	086916a81fb67e2e2a371ec4605b766188adddb0	commit \| diff
parent	42bcaa2ca12865ec09244a66314dafcf05024e4e	commit \| diff

Merge commit 'origin/master'

Conflicts:

mount/lomount.c
mount/lomount.h
mount/mount.c

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