summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-29 20:11:47 +0100
committerMichael Vogt <mvo@debian.org>2013-11-29 20:11:47 +0100
commitec980be7637b735aa91d7091dae6e18b150cb724 (patch)
treeff2b4d4b2b3f9a5257a0de6d59039da3236049a1 /debian/changelog
parente2264d3f957694e229a9f6976fc136b8f82ad770 (diff)
parent804d195655c48a448d576b2b196d18c2c816e824 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 246102a02..45ee59a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ apt (0.9.13.1~ubuntu2) UNRELEASED; urgency=low
* add autopkgtest support for the integration testsuite
* merge mvo/feature/edit-sources
+ * merge mvo/feature/edit-sources
+ * fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560)
+ * reset terminal on error (closes: #730795)
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Nov 2013 14:37:36 +0100