Silvio Rhatto 474b23271d Merge branch 'master' of git://labs.riseup.net/shared-sshd ... Conflicts: templates/sshd_config/Debian_squeeze.erb		2011-02-19 18:08:02 -02:00
..
sshd_config	Merge branch 'master' of git://labs.riseup.net/shared-sshd	2011-02-19 18:08:02 -02:00