From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 17 Jan 2013 23:43:33 +0000 (-0200)
Subject: Merge branch 'master' of git://labs.riseup.net/shared-sshd
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ca79037957522708830ae159b6cc7a05edbac340;p=puppet-sshd.git

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

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

ca79037957522708830ae159b6cc7a05edbac340