From 30f06a6351a869ba09a799d90493320b2e8d2699 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 4 Jun 2014 15:38:43 -0400
Subject: [PATCH] Merge changelog.

---
 debian/changelog | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2cdee57..7d81cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,13 @@
 python-defaults (2.7.7-1) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Bump version to 2.7.7.
 
- -- Matthias Klose <doko@debian.org>  Mon, 02 Jun 2014 19:54:25 +0200
-
-python-defaults (2.7.6-3) UNRELEASED; urgency=medium
-
-  * Fix typo in wheel package exception list.
+  [ Barry Warsaw ]
+  * Fix typo in policy doc re: wheel package exception list.
   * Add myself to Uploaders.
 
- -- Barry Warsaw <barry@debian.org>  Wed, 21 May 2014 15:13:19 -0400
+ -- Matthias Klose <doko@debian.org>  Mon, 02 Jun 2014 19:54:25 +0200
 
 python-defaults (2.7.6-2) unstable; urgency=medium
 
-- 
GitLab