]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@ubuntu.com>
Fri, 13 Mar 2015 14:01:18 +0000 (15:01 +0100)
committerMichael Vogt <mvo@ubuntu.com>
Fri, 13 Mar 2015 14:01:18 +0000 (15:01 +0100)
commit1c01d6cc57b19e599d926d245cee30ea25826220
treee5edd13e551023f106bed0bb2db5a12ff2084250
parentca495d048f6a6fd596b061208d28f319fa6dbcd8
parent1a0619ac765cc0b2f4906c96c1a4d7f510569a3f
Merge branch 'debian/sid' into ubuntu/master

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