diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-17 21:54:43 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-17 21:54:43 -0200 |
| commit | e87974d37018b7ab8cf422a0797644c20e84e0c6 (patch) | |
| tree | f356efc902b44e9d39efe06f8c7284b4fbb729a3 /templates | |
| parent | f9096cf9a0115d47755c1eb5421efe1885b4f8fc (diff) | |
| parent | 711a471ae8c77f0fce3f05dd57ebd308d0144f57 (diff) | |
| download | puppet-virtual-e87974d37018b7ab8cf422a0797644c20e84e0c6.tar.gz puppet-virtual-e87974d37018b7ab8cf422a0797644c20e84e0c6.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_virtual
Conflicts:
manifests/vserver.pp
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions