summaryrefslogtreecommitdiff
path: root/doc/security/comment_7_ebbb6f3617c879715a35900a07ea1909._comment
diff options
context:
space:
mode:
authorJoey Hess2015-04-23 09:24:53 -0400
committerJoey Hess2015-04-23 09:24:53 -0400
commit2d7c493403766871731121ac967672aa9440d2e8 (patch)
tree305c86d576f59147ef33afb8ac30b0c239acba57 /doc/security/comment_7_ebbb6f3617c879715a35900a07ea1909._comment
parent4a187cbd22820df2fa807848fa629b2819b2362a (diff)
parent89b6629464b6dbd27e8393181421e0089ae5f5f4 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'doc/security/comment_7_ebbb6f3617c879715a35900a07ea1909._comment')
0 files changed, 0 insertions, 0 deletions