r2229 - in zconfig/trunk/debian (changelog)

[arnau at users.alioth.debian.org]

    Date: Friday, May 6, 2011 @ 13:37:40
  Author: arnau
Revision: 2229

Merge 2.8.0-1 (never uploaded) and 2.8.0-2

Modified:
  zconfig/trunk/debian/changelog

Modified: zconfig/trunk/debian/changelog
===================================================================
--- zconfig/trunk/debian/changelog	2011-05-03 08:44:18 UTC (rev 2228)
+++ zconfig/trunk/debian/changelog	2011-05-06 13:37:40 UTC (rev 2229)
@@ -1,4 +1,4 @@
-zconfig (2.8.0-2) unstable; urgency=low
+zconfig (2.8.0-1) unstable; urgency=low
 
   * Team upload.
 
@@ -31,13 +31,10 @@
   * debian/copyright:
     + Update and convert to dep5 format.
 
- -- Arnaud Fontaine <arnau at debian.org>  Tue, 03 May 2011 17:38:57 +0900
-
-zconfig (2.8.0-1) unstable; urgency=low
-
+  [ Brian Sutherland ]
   * Update to version from ztk1.0
 
- -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Nov 2010 12:48:07 +0000
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 06 May 2011 22:36:13 +0900
 
 zconfig (2.7.1-4) unstable; urgency=low