summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-09-04 14:15:17 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-09-04 14:15:17 +0200
commit2c76d72d412c1d7a2e615cd036f0730faa81dff7 (patch)
tree56d6ed27e80770557d9d1f60f98fee00f25129a1 /debian
parent1efc8dbc3932d557880e37603be9a39a73a4d493 (diff)
parentfe5804fc5010dd8f2e9406187bfc1f6afeb29c5a (diff)
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b16778839..48c08a1e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+apt (0.9.7.5ubuntu2) UNRELEASED; urgency=low
+
+ Merged from lp:~donkult/apt/experimental
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/strutl.cc:
+ - support \n and \r\n line endings in ReadMessages
+
+ [ Michael Vogt ]
+ * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
+ - merge fix for LP: #346386
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Mon, 09 Jul 2012 17:36:40 +0200
+
apt (0.9.7.5ubuntu1) quantal; urgency=low
[ Michael Vogt ]