]> err.no Git - util-linux/commit
Merge branch 'master' into ubuntu-v2.13
authorLaMont Jones <lamont@mmjgroup.com>
Thu, 9 Aug 2007 22:00:25 +0000 (16:00 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Thu, 9 Aug 2007 22:01:50 +0000 (16:01 -0600)
commit6ba50c06400eb96a59b35802dd13d6dafed22106
tree2bee5dc703893a23f6f38cc70dd69288ba54fdbe
parent50c158416e5623e244ee415ceaa951bde0a8d7ef
parent51910fa7e17b3984281c15622a1667904dc6adde
Merge branch 'master' into ubuntu-v2.13

Conflicts:

debian/changelog
debian/changelog