diff options
| author | varac <varacanero@zeromail.org> | 2013-03-12 14:10:54 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-12 14:10:54 +0100 |
| commit | 546350d6f6e83e9ea22db79d07bdc38c694fbcdb (patch) | |
| tree | 555e42591968cdddba668da7f2bf2f4b2f4e0eb5 /spec | |
| parent | b915a67c6e7e3b1b75400dbbd4a9ac961c8eb032 (diff) | |
| parent | 3647bc9cb0137bdfa1dfeeb1bd58c2f099fb5df0 (diff) | |
Merge remote-tracking branch 'remotes/origin/feature/bigcouch'
Conflicts:
manifests/init.pp
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions