diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
| commit | 9faa6f0e33dd9e8c7ec3b96715ea3878ff9ef2f0 (patch) | |
| tree | 3bde05906addb27cb565d67b05bf686945ee235a /doc/design/encryption/comment_3_cca186a9536cd3f6e86994631b14231c._comment | |
| parent | 8986a918e5af331db29b953e061dc2d20a5b86d2 (diff) | |
| parent | a243fb1c7f04817fa19209689849aa2fe8631b3d (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'doc/design/encryption/comment_3_cca186a9536cd3f6e86994631b14231c._comment')
0 files changed, 0 insertions, 0 deletions