]> err.no Git - util-linux/commit
Merge remote branch 'origin/master'
authorLaMont Jones <lamont@debian.org>
Tue, 3 Aug 2010 05:02:28 +0000 (23:02 -0600)
committerLaMont Jones <lamont@debian.org>
Tue, 3 Aug 2010 05:02:28 +0000 (23:02 -0600)
commit0864d694ca05ea9383ef09bc1bc3a182e15e2ffa
tree2e5237f1d4e2cac2efad97ce31abc386c1e37b6d
parent3cbdfd84fde6159d7778e70618fbbc8df219cafe
parent6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc
Merge remote branch 'origin/master'

Conflicts:
mount/Makefile.am
sys-utils/ipcs.c
tests/ts/blkid/images-fs/befs.img.bz2
tests/ts/blkid/images-fs/ddf-raid.img.bz2
.gitignore
NEWS
login-utils/Makefile.am
mount/Makefile.am
mount/mount.8
mount/mount.c
sys-utils/ipcs.c