diff options
| author | Antoine Beaupré <anarcat@koumbit.org> | 2013-10-16 15:02:57 -0400 |
|---|---|---|
| committer | Antoine Beaupré <anarcat@koumbit.org> | 2013-10-16 15:02:57 -0400 |
| commit | 5ac51aa1072c59e7998602a8466cd9bbc2aa8cef (patch) | |
| tree | a8980893b5fe963f3eed1d7d1262bf12819abfe7 /manifests/add_id_certifier.pp | |
| parent | f661c786095e99087773f01351cebe00837f68a7 (diff) | |
| parent | 71d9ff0ef0ace9941a19858acb807f89dfe44946 (diff) | |
| download | puppet-monkeysphere-5ac51aa1072c59e7998602a8466cd9bbc2aa8cef.tar.gz puppet-monkeysphere-5ac51aa1072c59e7998602a8466cd9bbc2aa8cef.tar.bz2 | |
Merge remote-tracking branch 'sarava/master'
Conflicts:
README
manifests/init.pp
Diffstat (limited to 'manifests/add_id_certifier.pp')
0 files changed, 0 insertions, 0 deletions