From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 19 Feb 2011 20:08:02 +0000 (-0200)
Subject: Merge branch 'master' of git://labs.riseup.net/shared-sshd
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=474b23271d7c4f3b82ca2e7888225e74f87ae7a8;p=puppet-sshd.git

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

Conflicts:
	templates/sshd_config/Debian_squeeze.erb
---

474b23271d7c4f3b82ca2e7888225e74f87ae7a8