aboutsummaryrefslogtreecommitdiff
path: root/spec/defines
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-06-10 11:25:16 +0200
committermh <mh@immerda.ch>2014-06-10 11:25:16 +0200
commitcd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0 (patch)
treeb43a48d66f9dd1ecad4d681769e1e2ead75d2e58 /spec/defines
parentfb60c0c0c991d041084454586c2657165fe42622 (diff)
parent5c23b33200fc6229ada7f4e13672b5da0d4bdd8e (diff)
downloadpuppet-sshd-cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0.tar.gz
puppet-sshd-cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0.tar.bz2
Merge remote-tracking branch 'shared/master'
Conflicts: manifests/init.pp
Diffstat (limited to 'spec/defines')
0 files changed, 0 insertions, 0 deletions