diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-17 09:18:36 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-17 09:18:36 +0200 |
| commit | f49d103adc47c5c34f4ca852605ee55710e486b9 (patch) | |
| tree | eb63a4d80a82b2d9f9aa5bc25165a21cb38b215f /doc/apt_preferences.5.xml | |
| parent | b55e706a8794d810fb7c5a7c175c04ea207b1ce7 (diff) | |
| parent | dd4d9729975fc2de37cd69220bc05efb16badc77 (diff) | |
Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sid
Conflicts:
cmdline/apt-get.cc
Diffstat (limited to 'doc/apt_preferences.5.xml')
0 files changed, 0 insertions, 0 deletions