]> err.no Git - util-linux/commit
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Mon, 24 Aug 2009 05:21:10 +0000 (23:21 -0600)
committerLaMont Jones <lamont@debian.org>
Mon, 24 Aug 2009 05:21:10 +0000 (23:21 -0600)
commitd07b0c1a247c67ff87927bb3922631e24426222b
tree68c92749cc0049a413d80b3e7dedf120a5ac46af
parent87a62b5117eaf3f73685fd7c690c8668807b1705
parent437fa54f0516b39b633937fc20ff24c0dcc44bd7
Merge commit 'origin/master'

Conflicts:
getopt/getopt.1
fdisk/cfdisk.8
getopt/getopt.1
hwclock/hwclock.8
misc-utils/whereis.c
mount/losetup.8
mount/mount.8
mount/mount.c