merge patches from daniel to fix merge artifact and test failure

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index fbc6009a1379a7e8bb29a686cdd0b3cba3ebdedd..558b657ceccf89ed770423332722a32159893f5d 100644 (file)
--- 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