]> err.no Git - util-linux/commit
Merge branch 'stable/v2.13'; commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Wed, 5 Dec 2007 03:30:16 +0000 (20:30 -0700)
committerLaMont Jones <lamont@debian.org>
Wed, 5 Dec 2007 03:30:16 +0000 (20:30 -0700)
commit63a33c7ff679705262baa26c7730cd5f2640c3b5
treef80d3fce570fa208d4043c3dca6e4736eb5a1e35
parent811e6c250e91a32a30034fb653f2fabc5f4eaa2a
parent07f0f4da57e3e482118bacde04a6bf7413b1f453
parentd08a2b44b5d57fb2b52869372decfb35802c7557
Merge branch 'stable/v2.13'; commit 'origin/master'

Conflicts:

getopt/getopt.1
fdisk/sfdisk.c
mount/Makefile.am
mount/mount.c
sys-utils/Makefile.am