]> git.saurik.com Git - apt.git/commitdiff
Merge remote-tracking branch 'donkult/feature/clientmergepdiffs' into debian/experime...
authorMichael Vogt <mvo@debian.org>
Sun, 5 Jan 2014 09:06:26 +0000 (10:06 +0100)
committerMichael Vogt <mvo@debian.org>
Sun, 5 Jan 2014 09:06:26 +0000 (10:06 +0100)
1  2 
apt-pkg/contrib/fileutl.cc

Simple merge