From: Michael Vogt <mvo@debian.org>
Date: Wed, 14 May 2014 16:04:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
X-Git-Tag: 1.1.exp1~19
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e110d7bf5675f484c06b82f621ac98bedc464865?hp=e110d7bf5675f484c06b82f621ac98bedc464865

Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

Conflicts:
	apt-pkg/acquire-item.cc
	apt-pkg/acquire-item.h
---