.
.
.
Merge branch 'master' of github.com:neutrico/maven-php-plugin

Conflicts:
	php-parent-pom/pom.xml
	site-parent/pom.xml