]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@ubuntu.com>
Wed, 5 Nov 2014 16:48:11 +0000 (17:48 +0100)
committerMichael Vogt <mvo@ubuntu.com>
Wed, 5 Nov 2014 16:48:11 +0000 (17:48 +0100)
commit3e68f7e41022790619c698a32390a5256fadba7c
treed9a9e08517ecedc342177512921a2fba43615fa1
parent6e2261d0f250406058d66b360080aa986953ae19
parent28460cb27846b2437010b08adf10bde18e370974
Merge branch 'debian/sid' into debian/experimental

Conflicts:
debian/changelog
apt-pkg/deb/dpkgpm.cc
debian/changelog
doc/examples/configure-index