diff options
author | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
commit | 784e35e86293094bb5c1456c8f9c844df2a71f12 (patch) | |
tree | 28073f068ca09c46c04a5ed9e047824f782b15ac /apt-private/private-update.h | |
parent | a84a4d2ab78c498d9797c07d463daec4095b37de (diff) | |
parent | 28b4b983d95fa742a5431547285a748e8b856399 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'apt-private/private-update.h')
0 files changed, 0 insertions, 0 deletions