]> gitweb.fluxo.info Git - puppet-samba.git/commit
Merge branch 'master' of https://github.com/ajjahn/puppet-samba
authorMarc <mmontgomery@pcch.org>
Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
committerMarc <mmontgomery@pcch.org>
Fri, 24 Aug 2012 16:32:06 +0000 (12:32 -0400)
commitf7ea7901aa2b203b08dc8f33ac0a1622b2a9c795
tree6f209a37188f0923e75fefec9bd161a6fbb20b92
parent1d947e24a1d2fdf060df76a3925a079fde4c0901
parent7c10f82e1bf5e0d79283efdcffe154f3411486ee
Merge branch 'master' of https://github.com/ajjahn/puppet-samba

Conflicts:
manifests/server.pp
manifests/server.pp
manifests/share.pp