From: LaMont Jones <lamont@debian.org>
Date: Wed, 3 Oct 2007 04:27:00 +0000 (-0600)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b17c32f04b65e69946995014103db51d536dc8;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	debian/changelog
---

f0b17c32f04b65e69946995014103db51d536dc8
diff --cc debian/changelog
index 7518cc23,23bca68e..e91b2591
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 -util-linux (2.13-9) unstable-UNRELEASED; urgency=low
 +util-linux (2.14~a0-0) experimental-UNRELEASED; urgency=low
  
-   * New release
+   * Start new release
+   * DO NOT EDIT: changelog is built from commit messages
  
 + -- LaMont Jones <lamont@debian.org>  Fri, 07 Sep 2007 08:52:55 -0600
 +
++util-linux (2.13-9) unstable-UNRELEASED; urgency=low
++
++  * New release
++
+  -- LaMont Jones <lamont@debian.org>  Mon, 01 Oct 2007 22:17:42 -0600
+ 
  util-linux (2.13-8) unstable; urgency=low
  
    * Upstream git: