r2115 - in zope.interface/trunk/debian (changelog)

[jinty-guest at users.alioth.debian.org]

    Date: Wednesday, November 3, 2010 @ 15:39:56
  Author: jinty-guest
Revision: 2115

Merge changelog entries

Modified:
  zope.interface/trunk/debian/changelog

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2010-11-03 15:37:49 UTC (rev 2114)
+++ zope.interface/trunk/debian/changelog	2010-11-03 15:39:56 UTC (rev 2115)
@@ -1,16 +1,14 @@
 zope.interface (3.6.1-1) UNRELEASED; urgency=low
 
+  [ Brian Sutherland ]
   * Update to version from ztk1.0
 
- -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Nov 2010 13:09:46 +0000
-
-zope.interface (3.5.3-2) UNRELEASED; urgency=low
-
+  [ Matthias Klose ]
   * The egg doesn't require setuptools. LP: #563060.
   * Call setup.py install with --install-layout=deb to install into
     the final location.
 
- -- Matthias Klose <doko at ubuntu.com>  Wed, 14 Apr 2010 17:24:26 +0200
+ -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Nov 2010 13:09:46 +0000
 
 zope.interface (3.5.3-1) unstable; urgency=low