From: intrigeri <intrigeri@boum.org>
Date: Sun, 17 Oct 2010 00:34:50 +0000 (+0200)
Subject: Merge remote branch 'nadir/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0d41016e4f40a5b9c80971f7f2280b236cb7e46a;p=puppet-sshd.git

Merge remote branch 'nadir/master'

Conflicts:
	manifests/init.pp
---

0d41016e4f40a5b9c80971f7f2280b236cb7e46a