got it
Merge branch 'master' of github.com:hcs/puppet-module-nfs

Conflicts:
	manifests/init.pp