summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2013-03-25 08:56:42 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2013-03-25 08:56:42 +0100
commit2f8f21c3d494328f0b4a544998fc6118b25b56c3 (patch)
treebbeff3ce772d3b77893ce5ffa3260bdd95550644 /debian/changelog
parentc510253888191fe9537559ad2fdd982dc3fd89eb (diff)
merge patches from daniel to fix merge artifact and test failure
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fbc6009a1..558b657ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low
* cmdline/apt-get.cc:
- do not have space between "-a" and option when cross building
(closes: #703792)
+ * test/integration/test-apt-get-download:
+ - fix test now that #1098752 is fixed
+ * po/{ca,cs,ru}.po:
+ - fix merge artifact
-- Christian Perrier <bubulle@debian.org> Sun, 24 Mar 2013 08:57:45 +0100