]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@ubuntu.com>
Wed, 8 Oct 2014 08:47:09 +0000 (10:47 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Wed, 8 Oct 2014 08:47:09 +0000 (10:47 +0200)
commit2e8e5aaca4e51737e5a3a56c140d6817251bf0f7
tree1b1224e9b55d4e7f0002feeba51711912d8fb314
parentd667daf3e6ba5bfc7feb8a5ed0a0bd2d1febde4d
parent536fdb8823fdec24c26d984317b8162237c427c3
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
configure.ac
debian/changelog
cmdline/apt-get.cc
configure.ac
debian/changelog
debian/rules