From: Marc <mmontgomery@pcch.org>
Date: Fri, 24 Aug 2012 16:32:06 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/ajjahn/puppet-samba
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f7ea7901aa2b203b08dc8f33ac0a1622b2a9c795;p=puppet-samba.git

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

Conflicts:
	manifests/server.pp
---

f7ea7901aa2b203b08dc8f33ac0a1622b2a9c795