summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-19 18:08:02 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-19 18:08:02 -0200
commit474b23271d7c4f3b82ca2e7888225e74f87ae7a8 (patch)
treeb2b58dacd66a40f5d27a381439d91006339da5b8 /files
parentac30247bf9d7ea57c01cc5ad743e2788f6e8ea0d (diff)
parente0d3cdbd36bf1d06984240da216b4492efc4e69d (diff)
Merge branch 'master' of git://labs.riseup.net/shared-sshd
Conflicts: templates/sshd_config/Debian_squeeze.erb
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions