]> err.no Git - util-linux/commit
Merge branch 'master' into ubuntu-v2.13
authorLaMont Jones <lamont@mmjgroup.com>
Wed, 8 Aug 2007 19:22:37 +0000 (13:22 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Wed, 8 Aug 2007 19:22:37 +0000 (13:22 -0600)
commitb73e43510174cd96535b284c73d0bbc099702acf
tree0e08d339f521b36c73947049548bf5486db48391
parentca959c03a1ffa5e5846c7e905a4cdc0187d51f24
parent4b9f01e797a5c75f7a24eaf084347acc216547e7
Merge branch 'master' into ubuntu-v2.13

Conflicts:

debian/changelog
debian/changelog
debian/control