wemux
Merge branch 'master' of github.com:maxcole/puppet

Conflicts:
	modules/systools/manifests/init.pp