From: LaMont Jones <lamont@debian.org>
Date: Fri, 12 Oct 2007 03:02:43 +0000 (-0600)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ed4d81045389b87975443a3f4e2189f706c1eb8;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	debian/changelog
	disk-utils/mkfs.cramfs.c
---

5ed4d81045389b87975443a3f4e2189f706c1eb8
diff --cc debian/changelog
index e91b2591,9766c48f..a1dea781
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,16 @@@
 +util-linux (2.14~a0-0) experimental-UNRELEASED; urgency=low
 +
 +  * 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
++ -- LaMont Jones <lamont@debian.org>  Thu, 11 Oct 2007 21:01:08 -0600
 +
  util-linux (2.13-9) unstable-UNRELEASED; urgency=low
  
-   * New release
+   * Start new release
+   * DO NOT EDIT: changelog is built from commit messages
  
-  -- LaMont Jones <lamont@debian.org>  Mon, 01 Oct 2007 22:17:42 -0600
+  -- LaMont Jones <lamont@debian.org>  Thu, 04 Oct 2007 14:34:37 -0600
  
  util-linux (2.13-8) unstable; urgency=low