Support for debian trusty.
Merge branch 'master' of https://github.com/icalvete/puppet-php5

Conflicts:
	manifests/params.pp