From: Michael Vogt <mvo@debian.org>
Date: Sat, 17 Aug 2013 08:07:20 +0000 (+0200)
Subject: Merge branch 'debian/sid' into debian/experimental
X-Git-Tag: 1.1.exp1~40
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1afd369d00f2f9272462ffc6c6e24f293a81459e?ds=sidebyside;hp=1afd369d00f2f9272462ffc6c6e24f293a81459e

Merge branch 'debian/sid' into debian/experimental

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