Mitchell Hashimoto 919c3935e1 Merge branch 'shell-env-vars' ... Conflicts: website/source/docs/provisioners/shell.html.markdown		2013-06-28 08:20:12 -04:00
..
provisioner.go	Merge branch 'shell-env-vars'	2013-06-28 08:20:12 -04:00
provisioner_test.go	Merge branch 'shell-env-vars'	2013-06-28 08:20:12 -04:00