]> gitweb.fluxo.info Git - puppet-nodo.git/commit
Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 22 Dec 2011 13:05:41 +0000 (11:05 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 22 Dec 2011 13:05:41 +0000 (11:05 -0200)
commiteb33a9ec1f8e39d439f8b9ab93324daa6cb8b166
tree519073c17211c49855915b459fc0d5268baca426
parent869a40afda09c344d8e652c5f08d06e407e3ceae
parent4c5b595cf0e0ebcff1c49b916bbce3b4979cc82f
Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo

Conflicts:
manifests/subsystems/utils/debian.pp
manifests/subsystems/utils/debian.pp