summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-24 17:58:06 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-24 17:58:06 +0100
commit4beb315f53061e537b923009e228981bb1e3fa7f (patch)
tree14abcb7738545cdd8ef9c26a13fbcd6c1784bf8a /debian
parent3bceb058c0d1890eee923aa014c41ad458f88fb6 (diff)
parent0004842de7eeac345b614fa0b6bd241af0c4cc34 (diff)
merged from lp:~mvo/apt/mvo
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d1e636a32..3d63fb64e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ apt (0.8.13ubuntu2) UNRELEASED; urgency=low
* po/makefile:
- add hack to run MSGMERGE again if it segfaults. this is to help
powerpc to bootstrap
+ * mirror method:
+ - merge fix from Matt Zimmerman, many thanks (LP: #741098)
+ - do not crash if the mirror file fails to download
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 20:39:21 +0100