summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2013-04-23 08:15:06 +0200
committerMichael Vogt <mvo@debian.org>2013-08-15 09:28:09 +0200
commit0e279e3527ce3dc9de0e01441ad693f415e75d6a (patch)
treef55742c35544b03fa01e9e1e623d8ee587023f9d /debian
parent183116d1a64a2610b88fa6b50f2c5199b69d5841 (diff)
downloadapt-0e279e3527ce3dc9de0e01441ad693f415e75d6a.tar.gz
merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445)
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8e4def2b0..7075cb844 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.11) UNRELEASED; urgency=low
+
+ [ Daniel Hartwig ]
+ * Clarify units of Acquire::http::Dl-Limit (closes: #705445)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Aug 2013 09:27:35 +0200
+
apt (0.9.10) unstable; urgency=low
The "Hello to Debconf" upload
@@ -38,7 +45,7 @@ apt (0.9.10) unstable; urgency=low
* make the keyring locations in apt-key configurable
* let apt-key del work better with softlink and single key keyrings
* do not call 'apt-key update' in apt.postinst
-
+
[ Colin Watson ]
* prefer native arch over higher priority for providers (Closes: #718482)