From: LaMont Jones <lamont@debian.org>
Date: Sat, 19 Jan 2008 17:38:31 +0000 (-0700)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5a7d808968fbbf94fd37b83ae382c2e7fe8f7ce;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	AUTHORS
	NEWS
	configure.ac
	docs/v2.13.1-ReleaseNotes
	po/de.po
	po/hu.po
---

e5a7d808968fbbf94fd37b83ae382c2e7fe8f7ce