From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 20 Jan 2013 23:24:54 +0000 (-0200)
Subject: Merge branch 'master' of https://github.com/camptocamp/puppet-bind
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01;p=puppet-bind.git

Merge branch 'master' of https://github.com/camptocamp/puppet-bind

Conflicts:
	manifests/definitions/bind-mx.pp
---

3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01