From: LaMont Jones <lamont@debian.org>
Date: Tue, 29 Apr 2008 01:51:36 +0000 (-0600)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c8d590cab0b3c33301b0159d894c63c8aa27b7;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	debian/changelog
---

a9c8d590cab0b3c33301b0159d894c63c8aa27b7
diff --cc debian/changelog
index 7d204f25,4cbf3b9e..1139b618
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,4 +1,12 @@@
 +util-linux (2.14~rc1-1) experimental; urgency=low
 +
 +  * New upstream version
 +  * control: drop -1 version from libslang2-dev build-dep
 +  * control: standards-version 3.7.3.0
 +
 + -- LaMont Jones <lamont@debian.org>  Thu, 17 Apr 2008 18:19:27 -0600
 +
- util-linux (2.13.1.1-0) unstable; urgency=low
+ util-linux (2.13.1.1-1) unstable; urgency=low
  
    [Steve Grubb]