]> err.no Git - util-linux/commit
Merge branch 'master' into ubuntu-v2.13
authorLaMont Jones <lamont@mmjgroup.com>
Sat, 4 Aug 2007 03:40:43 +0000 (21:40 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Sat, 4 Aug 2007 03:40:43 +0000 (21:40 -0600)
commit45c5a2d43459e87fa4e8078585fe42505ace0094
tree54b0885029a7a273b9c6957c2bdcbe35dc3adc09
parent33d2c5df473ab5cbb40f0081dd42f6fad3c5dfe6
parentbc04a05e4d92877501c67192afea8da1c8cd5d1e
Merge branch 'master' into ubuntu-v2.13

Conflicts:

debian/changelog
debian/control
debian/rules

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>
debian/changelog
debian/control
debian/rules