]> err.no Git - util-linux/commitdiff
Merge branch 'stable/v2.13'
authorLaMont Jones <lamont@debian.org>
Sat, 19 Jan 2008 17:38:31 +0000 (10:38 -0700)
committerLaMont Jones <lamont@debian.org>
Sat, 19 Jan 2008 17:38:31 +0000 (10:38 -0700)
Conflicts:

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


Trivial merge