From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Mar 2016 17:18:03 +0000 (-0300)
Subject: Merge branch 'master' of https://github.com/ajjahn/puppet-samba
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=309d5859d9c801218075789fe068869ab49065f5;p=puppet-samba.git

Merge branch 'master' of https://github.com/ajjahn/puppet-samba

Conflicts:
	manifests/server/service.pp
---

309d5859d9c801218075789fe068869ab49065f5