diff options
| author | Micah Anderson <micah@riseup.net> | 2008-12-07 12:12:33 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-12-07 12:12:33 -0500 |
| commit | 667d7e30df76c724d9919977360704d6a55d4c20 (patch) | |
| tree | 1919f3902d0dc46fad1ca42e366cbb80f02df877 /files | |
| parent | fa072188dc8f1b475d4000fe61ea4fcf5e82cf98 (diff) | |
| parent | ec2501d07c7d3b048ee8b6829ef028fbc13a354f (diff) | |
| download | puppet-sshd-667d7e30df76c724d9919977360704d6a55d4c20.tar.gz puppet-sshd-667d7e30df76c724d9919977360704d6a55d4c20.tar.bz2 | |
Merge commit 'ng/master'
Conflicts:
manifests/init.pp
Conflict due to indentation formatting differences
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions