Mitchell Hashimoto 75395af12d Merge branch '1064-fix-upload-file-permissions' of github.com:rasa/packer into rasa-1064-fix-upload-file-permissions
Conflicts:
	builder/parallels/common/step_upload_parallels_tools.go
	builder/vmware/common/step_upload_tools.go
	provisioner/chef-client/provisioner.go
	provisioner/chef-solo/provisioner.go
2014-09-08 13:20:46 -07:00
..
2013-11-09 13:22:13 -08:00
2013-11-08 16:55:02 -08:00
2014-09-05 15:48:42 -07:00
fmt
2014-09-08 10:28:21 -07:00
2013-11-08 22:00:57 -08:00
2014-09-05 15:24:12 -07:00
2013-11-09 13:03:01 -08:00
2014-09-05 15:48:42 -07:00