From 83e6798e72fabee7ec333a7e897b095cda688c45 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 Mar 2011 17:37:18 +0100
Subject: merge fix from Matt Zimmerman, many thanks (LP: #741098)

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index d9a20765f..6ccb3dede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ apt (0.8.13) unstable; urgency=low
   * mirror method:
     - when downloading data, show the mirror being used
     - randomize mirror list to ensure more even load
+    - merge fix from Matt Zimmerman, many thanks (LP: #741098)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 
-- 
cgit v1.2.3