]> gitweb.fluxo.info Git - puppet-sshd.git/commit
Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Tue, 10 Jun 2014 09:25:16 +0000 (11:25 +0200)
committermh <mh@immerda.ch>
Tue, 10 Jun 2014 09:25:16 +0000 (11:25 +0200)
commitcd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0
treeb43a48d66f9dd1ecad4d681769e1e2ead75d2e58
parentfb60c0c0c991d041084454586c2657165fe42622
parent5c23b33200fc6229ada7f4e13672b5da0d4bdd8e
Merge remote-tracking branch 'shared/master'

Conflicts:
manifests/init.pp
manifests/init.pp