]> err.no Git - util-linux/commit
Merge remote branch 'origin/master' master
authorLaMont Jones <lamont@debian.org>
Tue, 1 Feb 2011 03:15:49 +0000 (20:15 -0700)
committerLaMont Jones <lamont@debian.org>
Tue, 1 Feb 2011 03:15:49 +0000 (20:15 -0700)
commit11292d25510e67c83c6580401eccd42d6d6da931
treeca5850da93c90f8798d7ff115e0124edffb8bb97
parent4f9e177060fb5ad6e574598aefdf2d5f50a8b54f
parent9f55bf3794ca98852dd1f352f993dea60d83a2e1
Merge remote branch 'origin/master'

Conflicts:
mount/mount.8
mount/mount.c
.gitignore
NEWS
hwclock/hwclock.c
login-utils/agetty.c
mount/Makefile.am
mount/lomount.c
mount/mount.8
mount/mount.c