Test one for Apache
Merge branch 'master' of https://github.com/eugenetolan/JenkinsLove

Conflicts:
	apache1.pp