Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature...
authorMichael Vogt <mvo@debian.org>
Tue, 21 Jan 2014 06:20:07 +0000 (07:20 +0100)
committerMichael Vogt <mvo@debian.org>
Tue, 21 Jan 2014 06:20:07 +0000 (07:20 +0100)
commitf744c64c591cec9e5aa489a9af55e1ed6d1871d1
treede1d27910d66062508b22c5a7b46c288d1b3fab9
parent7f316a3feab95370f1dd28c08c58bc3c140bf0a0
parent1700c3cfb902f3f61fa4d9269523467fcceaaf58
Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature/source-deb822

Conflicts:
test/integration/test-apt-sources-deb822
test/integration/test-apt-sources-deb822
test/libapt/sourcelist_test.cc