]> gitweb.fluxo.info Git - puppet-bind.git/commit
Merge branch 'master' of https://github.com/camptocamp/puppet-bind
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 20 Jan 2013 23:24:54 +0000 (21:24 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 20 Jan 2013 23:24:54 +0000 (21:24 -0200)
commit3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01
treedf97fe71507fd9eeed3deb08b87f41a503e75bbe
parent999e4e426996f3169b0a8f647eee8e8ab4ec8c33
parent88a39666e5b0ddf668baf93c111b549628f79704
Merge branch 'master' of https://github.com/camptocamp/puppet-bind

Conflicts:
manifests/definitions/bind-mx.pp