Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Sat, 22 Feb 2014 23:45:56 +0000 (00:45 +0100)
committerMichael Vogt <mvo@debian.org>
Sat, 22 Feb 2014 23:45:56 +0000 (00:45 +0100)
commiteccff323a093d91fff379e7c8460d7e5c8db8ad1
treed539d21c6716af3122edabae91feadccfb3c12ad
parent2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2
parentb7ed961b8099c05f65e18d4c73ead50cc5c8bff1
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
debian/changelog
cmdline/apt-get.cc
debian/apt.cron.daily
debian/changelog