Require php5
Merge pull request #1 from ppp0/issue-21

Quick fixes to install scripts
Merge branch 'master' of github.com:ppp0/puppet-packages
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-16
Adjust readme
Require php5 module
Implement basic apache manifest
Implement mod-php for apache2
Add apache2 vhost definition
Changed php5 to php5-common
Remove mod::php
Merge pull request #29 from tomaszdurka/issue-29

Adjust readme
Merge pull request #31 from ppp0/issue-31

php5 package should not install apache
Set file permissions
Add enabled flag, set file permissions correctly
Fix typo
Include php5-common instead of php5
Merge pull request #16 from tomaszdurka/issue-16

Composer: require php-cli, curl
Merge pull request #27 from tomaszdurka/issue-27

Implement apache2 package
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-30

Conflicts:
	modules/php5/manifests/init.pp