Merge remote-tracking branch 'mvo/bugfix/coverity' into debian/sid
authorMichael Vogt <mvo@debian.org>
Thu, 22 Aug 2013 20:24:27 +0000 (22:24 +0200)
committerMichael Vogt <mvo@debian.org>
Thu, 22 Aug 2013 20:24:27 +0000 (22:24 +0200)
Conflicts:
apt-pkg/tagfile.h

1  2 
apt-pkg/acquire-item.cc
apt-pkg/contrib/cmndline.cc
apt-pkg/contrib/strutl.cc
apt-pkg/tagfile.cc
apt-pkg/tagfile.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge