* debian/apt.cron.daily:

  - run unattended-upgrades even if there was a error during
    the apt-get update (LP: #676295)

diff --cc debian/apt.cron.daily
Simple merge

diff --cc debian/changelog
index cd52fe22a1a67ba04bc27b9b58a9226194cda55b,cbaa65748fbf07a2c773fd34dcd3a1856c0b0278..b42a3819264b801f4edf333a2733f5d3d8ed2642
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,21 @@@
 -apt (0.8.13.3) unstable; urgency=low
++apt (0.8.13.2ubuntu2) UNRELEASED; urgency=low
+ 
 -  [ Thorsten Spindler ]
 -  * debian/zzapt.cron.daily:
 -    - move cron job to the end of execution (LP: #727685)
 -  
+   [ Michael Vogt ]
 -  * mirror method:
 -    - do not crash if the mirror file fails to download
 -  * apt-pkg/aptconfiguration.cc:
 -    - fix comparing for a empty string
+   * debian/apt.cron.daily:
+     - run unattended-upgrades even if there was a error during
+       the apt-get update (LP: #676295)
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
+ 
 +apt (0.8.13.2ubuntu1) natty; urgency=low
 +
 +  * merge fixes from debian-sid, most notable the handling of
 +    arch=all architectures in python-apt (LP: #733741)
 +  * apt-pkg/aptconfiguration.cc:
 +    - fix comparing for a empty string
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 13:19:56 +0200
 +
  apt (0.8.13.2) unstable; urgency=low
  
    [ David Kalnischkies ]