Aktueller Stand (Installation puppet)
Merge branch 'master' of
https://github.com/manicstar/vagrant-wheezy-php53.git

Conflicts:
	.gitignore
	packer/wheezy-32/scripts/01_base.sh
	packer/wheezy-32/scripts/04_puppet.sh
	packer/wheezy-32/template.json