Merge branch 'master' of git://labs.riseup.net/shared-sshd

author Silvio Rhatto <rhatto@riseup.net>

Sun, 13 Feb 2011 17:13:10 +0000 (15:13 -0200)

committer Silvio Rhatto <rhatto@riseup.net>

Sun, 13 Feb 2011 17:13:10 +0000 (15:13 -0200)
author Silvio Rhatto <rhatto@riseup.net>
Sun, 13 Feb 2011 17:13:10 +0000 (15:13 -0200)
committer Silvio Rhatto <rhatto@riseup.net>
Sun, 13 Feb 2011 17:13:10 +0000 (15:13 -0200)
diff --cc manifests/init.pp
Simple merge
diff --cc templates/sshd_config/Debian_lenny.erb
Simple merge
author	Silvio Rhatto <rhatto@riseup.net>
	Sun, 13 Feb 2011 17:13:10 +0000 (15:13 -0200)
committer	Silvio Rhatto <rhatto@riseup.net>
	Sun, 13 Feb 2011 17:13:10 +0000 (15:13 -0200)
		1	2
manifests/init.pp	patch \|	diff1 \|	diff2 \|	blob \| history
templates/sshd_config/Debian_lenny.erb	patch \|	diff1 \|	diff2 \|	blob \| history