diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
| commit | 8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch) | |
| tree | 059b76fef1c1636a7e1ad16e5a4ce06304271718 /doc/apt_preferences.5.xml | |
| parent | 25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff) | |
| parent | e3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
debian/changelog
Diffstat (limited to 'doc/apt_preferences.5.xml')
0 files changed, 0 insertions, 0 deletions