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

author Marc <mmontgomery@pcch.org>

Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)

committer Marc <mmontgomery@pcch.org>

Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
author Marc <mmontgomery@pcch.org>
Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
committer Marc <mmontgomery@pcch.org>
Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
diff --cc manifests/server.pp
Simple merge
diff --cc manifests/share.pp
Simple merge
author	Marc <mmontgomery@pcch.org>
	Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
committer	Marc <mmontgomery@pcch.org>
	Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
		1	2
manifests/server.pp	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/share.pp	patch \|	diff1 \|	diff2 \|	blob \| history