diff options
author | mh <mh@immerda.ch> | 2014-06-10 11:25:16 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-06-10 11:25:16 +0200 |
commit | cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0 (patch) | |
tree | b43a48d66f9dd1ecad4d681769e1e2ead75d2e58 /manifests/client | |
parent | fb60c0c0c991d041084454586c2657165fe42622 (diff) | |
parent | 5c23b33200fc6229ada7f4e13672b5da0d4bdd8e (diff) | |
download | puppet-sshd-cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0.tar.gz puppet-sshd-cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0.tar.bz2 |
Merge remote-tracking branch 'shared/master'
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/client')
0 files changed, 0 insertions, 0 deletions