]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/experimental' into feature/srv-records
authorMichael Vogt <mvo@debian.org>
Tue, 18 Aug 2015 09:54:05 +0000 (11:54 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 18 Aug 2015 09:54:05 +0000 (11:54 +0200)
commit21248c0f00ee71412dbadc6ebf84011cf974346d
tree7dc1f5904399482d2128765b5b86d57a4ac5b3e1
parente5f34ad3b043abf033c1626eb8449b75955d6760
parent4fc6b7570c3e97b65c118b58cdf6729fa94c9b03
Merge branch 'debian/experimental' into feature/srv-records

Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
cmdline/apt-helper.cc
cmdline/makefile