diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
| commit | 190656ed99241af034e1a105eefcd5a72214fe2f (patch) | |
| tree | 30310a17114b9d64b7c51a73b3af3a9cc171a56e /debian/copyright | |
| parent | 65c7bfcc55ec2243e1f4dcb5bbca54dce494bc63 (diff) | |
| parent | 36969d80d4c921dea8f3b48465dd9a533f97ecae (diff) | |
Merge branch 'master' into remotecontrol
Conflicts:
doc/devblog/day_152__more_ssh_connection_caching.mdwn
Diffstat (limited to 'debian/copyright')
0 files changed, 0 insertions, 0 deletions