summaryrefslogtreecommitdiff
path: root/privdata/privdata.gpg
diff options
context:
space:
mode:
authorJoey Hess2014-10-31 10:21:37 -0400
committerJoey Hess2014-10-31 10:21:37 -0400
commit43935ae7b06b44223cae4dc32613cd6751bc80f4 (patch)
tree424120ce08af0bce3f1409a31861daf84b40951a /privdata/privdata.gpg
parentb1c4ddff04b5571e7ec60e7bfb014db76fd48eae (diff)
parentca06c64bae82322348a07a97de924a1758a38b8f (diff)
Merge branch 'joeyconfig'
Conflicts: privdata/privdata.gpg
Diffstat (limited to 'privdata/privdata.gpg')
0 files changed, 0 insertions, 0 deletions