From e65c125fb031c219317c77724a6b4213cb3c695b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 4 May 2012 10:26:26 -0700
Subject: merge from ubuntu

---
 debian/changelog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 63f72fa5..d786c3c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 python-apt (0.8.5) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
   * python/cache.cc:
     - ensure that pkgApplyStatus is called when the cache is opened
       (thanks to Sebastian Heinlein for finding this bug), LP: #659438
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 17 Apr 2012 14:09:24 +0200
+  [ Stéphane Graber ]
+  * data/templates/Ubuntu.info.in:
+    - add quantal
+  
+ -- Michael Vogt <mvo@debian.org>  Tue, 17 Apr 2012 14:09:24 +0200
 
 python-apt (0.8.4) unstable; urgency=low
 
-- 
cgit v1.2.3