Local changes
Merge branch 'master' of https://github.com/Spalax/vagrant-mils-magento

Conflicts:
	shell/update-puppet.sh