Merge branch 'feature/abspath' into feature/apt-install-deb
authorMichael Vogt <mvo@ubuntu.com>
Mon, 28 Apr 2014 15:25:28 +0000 (17:25 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Mon, 28 Apr 2014 15:25:28 +0000 (17:25 +0200)
commit8e0002ac420707b94a8a43dfedea7fc182dd5851
treeee125ad1dd03f56436fb733f13d4c36c1e3d2fa8
parenta9d990a2602fca4f217705e356b449b0f42a7760
parent53ac87ac9c27af39df062516aab5dce880af107a
Merge branch 'feature/abspath' into feature/apt-install-deb

Conflicts:
test/libapt/fileutl_test.cc
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/fileutl.h
test/libapt/fileutl_test.cc