diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-06-11 18:34:29 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-11 18:34:29 +0200 |
commit | 3f26e1205e99675408a08b27eb7d07f88a349f3b (patch) | |
tree | b13f63dae16a2793154f6141afcfaf4926d25308 /doc/apt_preferences.5.xml | |
parent | bbbd1bc335ec3c0bb1b33d647fc8c30410c1adf8 (diff) | |
parent | 3082603f0ef76876810cb8c6d02d03ba67ec8c6b (diff) |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'doc/apt_preferences.5.xml')
0 files changed, 0 insertions, 0 deletions