Testing
Merge branches 'master' and 'master' of github.com:lavere/ZendServerPuppet

Conflicts:
	manifests/init.pp