]> gitweb.fluxo.info Git - puppet-monkeysphere.git/commit
Merge remote-tracking branch 'vireo/master' into merge
authormh <mh@immerda.ch>
Wed, 2 Jan 2013 19:55:28 +0000 (20:55 +0100)
committermh <mh@immerda.ch>
Wed, 2 Jan 2013 19:56:27 +0000 (20:56 +0100)
commit23398fc3f0178f73fa3dee5149426b1b28ce3a8a
tree2ab3f84da5aa561fa54bdf71a6ca2bd26655e0bc
parent6321144806ec67ff2d5a12df95b00f1250b8fcca
parentc4913fb3e46624494a0935ec133b25db735afc30
Merge remote-tracking branch 'vireo/master' into merge

Conflicts:
.gitignore
manifests/init.pp
.gitignore
README
manifests/init.pp