Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Sat, 25 Jan 2014 20:55:11 +0000 (21:55 +0100)
committerMichael Vogt <mvo@debian.org>
Sat, 25 Jan 2014 20:55:11 +0000 (21:55 +0100)
1  2 
apt-pkg/sourcelist.cc
test/integration/test-apt-sources-deb822

Simple merge