environment as parameter
Merge branch 'master' of https://github.com/icalvete/puppet-php5

Conflicts:
	manifests/init.pp