]> err.no Git - util-linux/commit
Merge branch 'stable/v2.13'
authorLaMont Jones <lamont@debian.org>
Thu, 13 Mar 2008 15:55:49 +0000 (09:55 -0600)
committerLaMont Jones <lamont@debian.org>
Thu, 13 Mar 2008 15:55:49 +0000 (09:55 -0600)
commit2ce90f44f0ef59f4a5039652c4625ea6a750ab22
treec2b068666ad333b469765352a76ad9597b3486db
parentf1bf0e345265a11c8fc16d7303aaf50e98bd3bec
parent347d7459834e11b99eeb2152a479d58023de3fe3
Merge branch 'stable/v2.13'

Conflicts:

disk-utils/mkswap.8
disk-utils/mkswap.c