diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-31 10:21:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-31 10:21:37 -0400 |
| commit | 43935ae7b06b44223cae4dc32613cd6751bc80f4 (patch) | |
| tree | 424120ce08af0bce3f1409a31861daf84b40951a /doc | |
| parent | b1c4ddff04b5571e7ec60e7bfb014db76fd48eae (diff) | |
| parent | ca06c64bae82322348a07a97de924a1758a38b8f (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata/privdata.gpg
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions