From: Michael Vogt <mvo@debian.org>
Date: Tue, 10 Dec 2013 07:15:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822
X-Git-Tag: 0.9.14.3.exp1~2^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e2fa0aa64d2249129543f82a213043d96469be1c?hp=--cc

Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822

Conflicts:
	apt-pkg/sourcelist.cc
---

e2fa0aa64d2249129543f82a213043d96469be1c