]> err.no Git - util-linux/commit
Merge branch 'stable/v2.16'
authorLaMont Jones <lamont@debian.org>
Mon, 18 Jan 2010 15:02:28 +0000 (08:02 -0700)
committerLaMont Jones <lamont@debian.org>
Mon, 18 Jan 2010 15:02:28 +0000 (08:02 -0700)
commitc3701c1d965cdc905bd580ece68a1c4008b4d1b0
treeb17b28d580bec649a61d93498fc5bf51acb3f965
parentdcdaeb08fa71025ceb0f5923a05fcce0aa70b0c3
parent86dccccf24f22e8fc76f1e450899c830671a4f57
Merge branch 'stable/v2.16'

Conflicts:
AUTHORS
NEWS
configure.ac
debian/changelog
disk-utils/fsck.minix.c
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
shlibs/blkid/src/probe.c
shlibs/blkid/src/superblocks/iso9660.c
shlibs/blkid/src/superblocks/vfat.c
NEWS
debian/changelog
disk-utils/fsck.minix.c