diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-04 19:52:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-04 19:52:09 -0400 |
| commit | e22002a7a99ceaaf193a6aa83d3c03e256d79f52 (patch) | |
| tree | 8a6460e3da5abfd0109d40e518fd1a8f233dc35b /doc | |
| parent | 2de60a902794669b40fae8c7135f989ccca2f8d5 (diff) | |
| parent | 0794dfbd7c6f854c3e517486be0722e4cf61db34 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions