]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
projects / puppet-sshd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cb562f 35bc5ea)
Merge remote branch 'nadir/master'
authorintrigeri <intrigeri@boum.org>
Sun, 17 Oct 2010 00:34:50 +0000 (02:34 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 17 Oct 2010 00:34:50 +0000 (02:34 +0200)
Conflicts:
manifests/init.pp


Trivial merge
Puppet module for sshd