From: LaMont Jones <lamont@debian.org>
Date: Mon, 7 Jan 2008 03:54:12 +0000 (-0700)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=497f525de3386a9516eca0aa42058632a5ef2f59;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	AUTHORS
	NEWS
	configure.ac
	debian/changelog
	docs/v2.13.1-ReleaseNotes
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.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

Kept master version of non-debian/
merged debian/changelog, dropped 2.14~a0 version
---

497f525de3386a9516eca0aa42058632a5ef2f59