]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Thu, 28 Nov 2013 19:04:14 +0000 (20:04 +0100)
committerMichael Vogt <mvo@debian.org>
Thu, 28 Nov 2013 19:04:14 +0000 (20:04 +0100)
commit05f4e3b8441a3dc867ea7956736202a93b36e95b
treeb8c117fd2c139eed91ce86fc785064a16e5908dd
parent17ab57f41a249fabb15cdbeeff5a5c0942ccf4ac
parentf832a745920c988188c64ba018d1e2b436627ad5
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
debian/changelog
apt-pkg/deb/dpkgpm.cc
debian/changelog