summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-06-15 14:23:03 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-06-15 14:23:03 +0200
commitbf7de05c855aea1f1d30e7aafd99700601a7bc4d (patch)
treecfebeabcce497c5650682990c2a2ab58b061dfd5 /debian/changelog
parenta423a554a821466eeea6865b1e226d8074c2abe6 (diff)
parent33e4d8b32a0baef91342527cce16cd47bcb1ee60 (diff)
merged latest upload
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 74eb09add..ec03e5a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.6ubuntu2) quantal; urgency=low
+
+ * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to
+ Marc Deslauriers. (LP: #1013128)
+
+ -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 Jun 2012 11:29:48 -0500
+
apt (0.9.6ubuntu1) quantal; urgency=low
[ Michael Vogt ]