]> gitweb.fluxo.info Git - puppet-virtual.git/commit
Merge branch 'master' of git://labs.riseup.net/module_virtual
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 27 Dec 2009 19:48:08 +0000 (17:48 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 27 Dec 2009 19:48:08 +0000 (17:48 -0200)
commitfb09f12c8a838372b64304fb40f047671e020d27
treefa3aa86c22a22347492c15abd1d3302ee322b3dc
parent615a9e08f69335d46695db4748725fcc5b4393b8
parent2163466a745fee4bb92d3e628343c2808dcf4bc3
Merge branch 'master' of git://labs.riseup.net/module_virtual

Conflicts:
manifests/vserver.pp
manifests/vserver.pp