From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 15 Jun 2012 12:23:03 +0000 (+0200)
Subject: merged latest upload
X-Git-Tag: 0.9.13.exp1ubuntu1~61
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/bf7de05c855aea1f1d30e7aafd99700601a7bc4d?hp=--cc

merged latest upload
---

bf7de05c855aea1f1d30e7aafd99700601a7bc4d
diff --cc debian/changelog
index 74eb09add,74eb09add..ec03e5a51
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -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 ]