summaryrefslogtreecommitdiff
path: root/doc/apt-secure.8.xml
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-08 10:47:09 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-08 10:47:09 +0200
commit2e8e5aaca4e51737e5a3a56c140d6817251bf0f7 (patch)
tree1b1224e9b55d4e7f0002feeba51711912d8fb314 /doc/apt-secure.8.xml
parentd667daf3e6ba5bfc7feb8a5ed0a0bd2d1febde4d (diff)
parent536fdb8823fdec24c26d984317b8162237c427c3 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: configure.ac debian/changelog
Diffstat (limited to 'doc/apt-secure.8.xml')
0 files changed, 0 insertions, 0 deletions